Merge commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken
* commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
Merge commit '2e4b98dcd88f14fdb35e46236ec916493c570f28' into froyo-plus-aosp
* commit '2e4b98dcd88f14fdb35e46236ec916493c570f28':
Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
Merge commit '8138cb49e47f9a9905a316a217757710185c66aa' into froyo-plus-aosp
* commit '8138cb49e47f9a9905a316a217757710185c66aa':
Make Surface.toString() show more useful info to help debug bug 2594388.
Merge commit '60ae65ed30564969b3e14642394c5e22c019125d' into kraken
* commit '60ae65ed30564969b3e14642394c5e22c019125d':
Restrict the range request to the servers claiming
Merge commit 'bd17156fda946fa0594687337bbd43cd85300940' into kraken
* commit 'bd17156fda946fa0594687337bbd43cd85300940':
Only honor the scrollbar mode at the minimum zoom
Merge commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp
* commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
Restrict the range request to the servers claiming
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp
* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
Only honor the scrollbar mode at the minimum zoom
Fixed public.xml value padding for kraken/master
Merge commit '81cd2e90' into manualmerge
Conflicts:
api/current.xml
Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
from WebCore, then we would enter the ACTION_UP handler and cancel
pending touch events in WebCore's message queue. This cancellation
was orginally needed for Flash but the touch model for Flash has now changed
and it's no longer necessary. In the case of the layout test controller
the events do come very fast, and we were hitting this case so
WebCore was losing the events that got cancelled meaning that the
JS touch callbacks weren't getting invoked.
This was exposed by fast/events/basic-single-touch-events.html.
Change-Id: Icea09fb55a5b77f7ab9c19473cfa5ae272867a9a
Merge commit '27e5a95afc10faca6314f9b710f07e8f99b3311f' into kraken
* commit '27e5a95afc10faca6314f9b710f07e8f99b3311f':
Re-enabling unit tests for PackageManager/Apps on SD.
Merge commit '5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp
* commit '5fa65082f16741394dcfbe756e3880d5c018dace':
Re-enabling unit tests for PackageManager/Apps on SD.
Fix bug 2158676: Update sym_action_call.png so that it matches phone
icon used elsewhere throughout the system.
Change-Id: I3ce9166dea6f8b626b6c68bec71f42d2797ce79f
Merge commit 'dc14dc6d60675be688c333bbc60a315d2c658054' into kraken
* commit 'dc14dc6d60675be688c333bbc60a315d2c658054':
Some debugging help for issue #2594388
Merge commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp
* commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206':
Some debugging help for issue #2594388
1. when an entry is pushed out of cache, it should be released if it is not
in use by any thread. This didn't have to be done when cache was NOT LRU
because the object either got into the cache while the caller had a reference
to it or it didn't. if it didn't get into cache (because cache is full),
the caller's close() released the object. But in LRU cache, an object
could get pushed out of cache due to LRU policy and if it is NOT in use
by any thread at the time it was pushed out of cache, then it
got GC'ed - which caused warnings to be pronted in the log.
2. also delete some unused methods in SQLiteDatabase.
Change-Id: I7831952647d3a057342bcc8ac186a6a26eb58f33
WallpaperService doesn't always call onSurfaceDestroyed()
Just helps us see a little better what is going on.
Change-Id: Ibe8efd9e343e880ca31df446c8b36c7fa3722e87
