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.
Merge commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab'
* commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab':
Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
Merge commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f' into eclair-plus-aosp
* commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f':
Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
Merge commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b'
* commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b':
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
Merge commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e' into eclair-plus-aosp
* commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e':
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1'
* commit '561aaedc0220db09d660c29d8237eb937373a7c1':
make sure that the sync thread is protected by a consistent lock
Merge commit '3cff76aaa893049d02467a231d477e86a0f80daa' into eclair-plus-aosp
* commit '3cff76aaa893049d02467a231d477e86a0f80daa':
make sure that the sync thread is protected by a consistent lock
Merge commit '8464eb2eaba5383006b3590d6a7baeec8e9872a8'
* commit '8464eb2eaba5383006b3590d6a7baeec8e9872a8':
Make certificate-handling-related constants public
Merge commit 'd21a04c06c0d9b1cb401c30bf6da778010872957' into eclair-plus-aosp
* commit 'd21a04c06c0d9b1cb401c30bf6da778010872957':
Make certificate-handling-related constants public
Merge commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb'
* commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb':
Fix rare NPE due to key being delivered after activity is stopped. #2062930
Merge commit 'ed5fede3f8a376ebed46beeb41796838847ad68d' into eclair-plus-aosp
* commit 'ed5fede3f8a376ebed46beeb41796838847ad68d':
Fix rare NPE due to key being delivered after activity is stopped. #2062930
Merge commit '1775d3b4150ff3961988ba392d0446c73a981f25'
* commit '1775d3b4150ff3961988ba392d0446c73a981f25':
dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked
Merge commit 'eafcadca7a69ac49d5484d04badcc8ccf177a5f3' into eclair-plus-aosp
* commit 'eafcadca7a69ac49d5484d04badcc8ccf177a5f3':
dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked
* changes:
dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked (in this case the state is dumped without the proper locks held which could result to a crash)
