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.
Merge commit 'c4ba7e39f1588604c0ae1e117e35b8413619abac' into eclair-plus-aosp
* commit 'c4ba7e39f1588604c0ae1e117e35b8413619abac':
New List and Tab assets.
Merge commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d' into eclair-plus-aosp
* commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d':
Add uuids to adb shell dumpsys bluetooth
* changes:
docs only. add new documentation for installing the new winusb driver. also add a link to the HTC support site for ADP flashing and remove references to the G1 and generalize to "consumer devices"
add new documentation for installing the new winusb driver.
also add a link to the HTC support site for ADP flashing
and remove references to the G1 and generalize to "consumer devices"
Merge commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532' into eclair-plus-aosp
* commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532':
clean up the too many deletes dialog
Merge commit '98d8858890227861c5dc28bc7acee9b1adedda45' into eclair-plus-aosp
* commit '98d8858890227861c5dc28bc7acee9b1adedda45':
Close suggestion cursors that arrive after adapter is closed
Merge commit 'ba223760895e62ad2fcb85476984cb29018860c9' into eclair
* commit 'ba223760895e62ad2fcb85476984cb29018860c9':
Close suggestion cursors that arrive after adapter is closed
