Merge commit '3d937945a60da48a383a5a3de37583b35abf9c11'
* commit '3d937945a60da48a383a5a3de37583b35abf9c11':
Change these string constants back to match donut.
Merge commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352' into eclair-plus-aosp
* commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352':
Change these string constants back to match donut.
Unfortunately we are stuck with the donut ones, can't change these in Eclair
to be the more correct names.
Change-Id: Id8aaa2e90cd21631b18a36bea3755a63d0e6d577
Merge commit '580a2921083f95e9ffd905bc31f838d683f667b4' into eclair-plus-aosp
* commit '580a2921083f95e9ffd905bc31f838d683f667b4':
Add a null check in PackageParser
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'
* commit 'eba188e21c752d98f03215eb15822bd39c462664':
Various tweaks to try to improve low memory behavior.
Merge commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339' into eclair-plus-aosp
* commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339':
Various tweaks to try to improve low memory behavior.
Merge commit '508990016a238b65ac657bc4c832cc732af20906'
* commit '508990016a238b65ac657bc4c832cc732af20906':
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Merge commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd' into eclair-plus-aosp
* commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd':
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Merge commit '569e114aa7d32c05ac64311b0bc545969c9b6893'
* commit '569e114aa7d32c05ac64311b0bc545969c9b6893':
PowerManagerService: Disallow all user activity when in proximity wake lock.
Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp
* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
PowerManagerService: Disallow all user activity when in proximity wake lock.
Merge commit '649092ad53f2fe63ac169196ae916377abfeb4da'
* commit '649092ad53f2fe63ac169196ae916377abfeb4da':
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
Merge commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519' into eclair-plus-aosp
* commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519':
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
Merge commit '2246bc54fa82b7a2531deeb2ac9563d0e773dd03'
* commit '2246bc54fa82b7a2531deeb2ac9563d0e773dd03':
Set Routing to A2DP only when state is Connected.
Merge commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7' into eclair-plus-aosp
* commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7':
Set Routing to A2DP only when state is Connected.
We were setting the routing to A2DP when the state was Connecting too.
This was incorrect and can cause problems. One such problem was when
handling an incoming connection we set the routing to A2DP before
authorization. And even if authorization succeeds we get out sync with
AVDTP command state.
Merge commit '4d5b4225e492f3de543efa195204f38d03a6721a' into eclair-plus-aosp
* commit '4d5b4225e492f3de543efa195204f38d03a6721a':
The Gservices settings for pruning messages/chats.
Merge commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f'
* commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f':
Change fade to use a gradient from opaque color to transparent color.
Merge commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4' into eclair-plus-aosp
* commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4':
Change fade to use a gradient from opaque color to transparent color.
Merge commit 'b24a6a1267bd59a320d99fd8a33e44608fc3f5bc'
* commit 'b24a6a1267bd59a320d99fd8a33e44608fc3f5bc':
Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
Merge commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0' into eclair-plus-aosp
* commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0':
Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
Merge commit '7fdaaa5b46a8f96a3667c9acd585e4352d12fb11'
* commit '7fdaaa5b46a8f96a3667c9acd585e4352d12fb11':
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '49c22570bb8717bb678dbd8bae6692bb585370fc' into eclair-plus-aosp
* commit '49c22570bb8717bb678dbd8bae6692bb585370fc':
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair
* commit '7566c1debebe072af76411e11d96810fd1409482':
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
