Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-plus-aosp
* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
This should fix a "black screen" bug that Motorola identified.
mProximitySensorActive was being set to true due to a proximity sensor change being posted
just after we disabled the proximity sensor.
Now we ignore proximity changes after the phone app releases the proximity lock after the call is done.
Change-Id: I417d423de3d43515389b1b7b008cdcb795cd10f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
1. Spanish SMS 71-160 chars not sent. This was because calculateLength
allowed for single-segment EMS encoding, while encodeUserDataPayload
did not. For now, change calculateLength to match encodeUserDataPayload
(ie, fallback to UTF16 in this case). (b/2224849)
2. Unicode value of N w/tilde was incorrect. (b/2224849)
3. Add '\' and '/' to the list of valid separators in CDMA SMS numeric
addresses. (b/2236527)
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-plus-aosp
* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
When tasks are moved to top or bottom, the app tokens are being rearranged.
* changes:
When tasks are moved to top or bottom, the app tokens are being rearranged. 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 '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-plus-aosp
* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-plus-aosp
* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-plus-aosp
* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
Another test for StatusBar test.
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.
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 '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-plus-aosp
* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
Throttle proximity sensor values so we do not process more than one change a second.
Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-plus-aosp
* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
Add needsOtaServiceProvisioning and used to not allow
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp
* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-plus-aosp
* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-plus-aosp
* commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-plus-aosp
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp
* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-plus-aosp
* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-plus-aosp
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
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>
commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 12:02:31 2009 -0800
DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.
commit 991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:24:11 2009 -0800
DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.
commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 16:11:54 2009 -0700
DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:10:49 2009 -0800
DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.
commit 5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:08:19 2009 -0800
DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.
commit 45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:02:23 2009 -0800
DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.
commit 6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date: Thu Oct 15 13:46:54 2009 -0700
DO NOT MERGE: Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.
Changed APIs to conform to the rest of the system.
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp
* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
