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 '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp
* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
PowerManagerService: Disallow all user activity when in proximity wake lock.
Merge commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519' into eclair-plus-aosp
* commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519':
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
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 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4' into eclair-plus-aosp
* commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4':
Change fade to use a gradient from opaque color to transparent color.
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 '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 '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 '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 '3cff76aaa893049d02467a231d477e86a0f80daa' into eclair-plus-aosp
* commit '3cff76aaa893049d02467a231d477e86a0f80daa':
make sure that the sync thread is protected by a consistent lock
Merge commit 'd21a04c06c0d9b1cb401c30bf6da778010872957' into eclair-plus-aosp
* commit 'd21a04c06c0d9b1cb401c30bf6da778010872957':
Make certificate-handling-related constants public
Merge commit 'ed5fede3f8a376ebed46beeb41796838847ad68d' into eclair-plus-aosp
* commit 'ed5fede3f8a376ebed46beeb41796838847ad68d':
Fix rare NPE due to key being delivered after activity is stopped. #2062930
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)
Merge commit '4813b51ec7f9f485a9f98583d4a90ca3d1bed6f7' into eclair-plus-aosp
* commit '4813b51ec7f9f485a9f98583d4a90ca3d1bed6f7':
Implement clean killing of the TTS service.
* changes:
Implement clean killing of the TTS service. If files were being synthesized to while the service was being killed, it would have left partially written files (with no header). This CL checks if the service is rendering to a file at the time the service is destroyed: if it is, it will stop the rendering and deletes the file.
Merge commit '1339614e67ff81b22d961e10d39f36118c536752' into eclair-plus-aosp
* commit '1339614e67ff81b22d961e10d39f36118c536752':
dumpstate: Get last_kmsg from /data instead of /proc.
If files were being synthesized to while the service was being killed,
it would have left partially written files (with no header). This CL
checks if the service is rendering to a file at the time the service
is destroyed: if it is, it will stop the rendering and deletes the file.
(in this case the state is dumped without the proper locks held which could result to a crash)
in addition, the last transaction and swap times are printed to the dump as well as the time spent
*currently* in these function. For instance, if SF is unresponsive because eglSwapBuffers() is stuck,
this will show up here.
Merge commit 'b89c9d422781d10c614af61b1519daed2b9086e2' into eclair-plus-aosp
* commit 'b89c9d422781d10c614af61b1519daed2b9086e2':
Add Gservices setting for the frequency to perform provisioning.
