Merge commit 'bd2473a9aaf0504609e7b8caca00646af53bbed6'
* commit 'bd2473a9aaf0504609e7b8caca00646af53bbed6':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0cb3f58741efa2b2b7477cbae973a29e614c62e8' into eclair-mr2-plus-aosp
* commit '0cb3f58741efa2b2b7477cbae973a29e614c62e8':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-mr2
* commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
This change fixes a corner case where a callback may not get handled until
a second callback arrives. This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated. We now check to see if
there is a pending callback to handle before we wait for another callback.
Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
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>
Merge commit '972bad3cb805494e10b0af1a40c1c3b2dc8d1fea'
* commit '972bad3cb805494e10b0af1a40c1c3b2dc8d1fea':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Merge commit '750e82e51921428dc4ad9a75f18b02b8048734d8' into eclair-mr2-plus-aosp
* commit '750e82e51921428dc4ad9a75f18b02b8048734d8':
When tasks are moved to top or bottom, the app tokens are being rearranged.
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-mr2
* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
When tasks are moved to top or bottom, the app tokens are being rearranged.
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)
* 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 '78e502df5163e8bcdd803af7f0a3958322a288dc'
* commit '78e502df5163e8bcdd803af7f0a3958322a288dc':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '892574f5f91b834f70ace880301db61f60d58362' into eclair-mr2-plus-aosp
* commit '892574f5f91b834f70ace880301db61f60d58362':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-mr2
* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '85fdfd0144c06dcef7652a8dd283f717cabe8759'
* commit '85fdfd0144c06dcef7652a8dd283f717cabe8759':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit 'e0c1bc983431254a6fb4084ccda507f15e8247f6'
* commit 'e0c1bc983431254a6fb4084ccda507f15e8247f6':
Throttle proximity sensor values so we do not process more than one change a second.
Merge commit '237cc15c171511e8c8ffe903c5d6f473593477b8' into eclair-mr2-plus-aosp
* commit '237cc15c171511e8c8ffe903c5d6f473593477b8':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2
* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de' into eclair-mr2-plus-aosp
* commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de':
Another test for StatusBar test.
Merge commit 'b31174de6a3d5ba39ccea02c9b653ea4f950bb89' into eclair-mr2-plus-aosp
* commit 'b31174de6a3d5ba39ccea02c9b653ea4f950bb89':
Throttle proximity sensor values so we do not process more than one change a second.
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-mr2
* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
Another test for StatusBar test.
Merge commit '9ce3df55bab12bea563faf764f7beb3555d5942c' into eclair-mr2
* commit '9ce3df55bab12bea563faf764f7beb3555d5942c':
Throttle proximity sensor values so we do not process more than one change a second.
Merge commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624'
* commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
Merge commit '47601c74f1302f70716c81714373687358ce8d8b'
* commit '47601c74f1302f70716c81714373687358ce8d8b':
Add needsOtaServiceProvisioning and used to not allow
Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'
* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
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.
