Merge commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb' into eclair-mr2-plus-aosp
* commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
* changes:
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif to from the full image, if both can generate of a thumbnail of same size.
Merge commit 'e14861eaa7e01e28e1f5a8dc9c10924400ac2cb7' into eclair-mr2-plus-aosp
* commit 'e14861eaa7e01e28e1f5a8dc9c10924400ac2cb7':
Add needsOtaServiceProvisioning and used to not allow
Merge commit '99588d590f0965beb899606a79db0889601c7ec0' into eclair-mr2-plus-aosp
* commit '99588d590f0965beb899606a79db0889601c7ec0':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit '571529f82159a3205547a61d1b720b695dc066be' into eclair-mr2-plus-aosp
* commit '571529f82159a3205547a61d1b720b695dc066be':
Fix bug 2242585 to unhide the new audio recording sources.
The window token rearrangement is defered if an animation is
underway. Force a focus recomputation when the window tokens are finally
rearranged so that we have a valid focused window.
Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-mr2
* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
Add needsOtaServiceProvisioning and used to not allow
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2
* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
This is work towards fixing bug 2228262
Specific issues fixed by this change:
+ GLThread names now include the thread id, making it easier to tell one
GLThread from another.
+ A private final static boolean LOG_THREADS can be set to true at compile
time to print out thread-related trace information, helpful for debugging
GLSurfaceView behavior. This static defaults to "false".
+ Changed calls to "notify" to "notifyAll" to make the code more
robust in case more than two threads are blocked on the same monitor.
+ Add a GLThreadManager to help manage the transition to
a new GLThread. Currently only one GLThread can be active in an address
space. When the second thread starts up, the GLThreadManager helps the old
GLThread to shut down,
+ Make sure we stop waiting for dead GLThreads. This is done by adding
checks for a variable mDone being true to our monitor wait loops. And
we use a "finally" clause at the end of GLThread.run() method to set mDone
and notifyAll any wait loops.
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp
* commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit 'a8f2c2b428f5f261c7c95b6b19404b05f0b30762' into eclair-mr2-plus-aosp
* commit 'a8f2c2b428f5f261c7c95b6b19404b05f0b30762':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp
* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2
* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-mr2
* commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit 'e334ce27f1c936af54748c1312cfdeeb3eea7184' into eclair-mr2-plus-aosp
* commit 'e334ce27f1c936af54748c1312cfdeeb3eea7184':
DO NOT MERGE: Squashed commit of the following:
Merge commit '7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp
* commit '7b2aa74f4644979acea456e1047c96e17e09bc6d':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6' into eclair-mr2-plus-aosp
* commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57' into eclair-mr2-plus-aosp
* commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57':
New live wallpaper API to expose author and description strings.
Merge commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0' into eclair-mr2-plus-aosp
* commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2
* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2
* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2
* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
This is to prevent a noisy proximity sensor from causing the screen to turn on and off
in rapid succession, which can trigger race conditions in the keyguard manager.
Change-Id: I2c6e54e4b41716e038854ed9a827c901579c8865
Signed-off-by: Mike Lockwood <lockwood@android.com>
