Merge commit '9002eb44043868a2f5fc38128748464492f297c6'
* commit '9002eb44043868a2f5fc38128748464492f297c6':
Cleanup the cache file when we decide not saving it.
Merge commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5' into eclair-mr2-plus-aosp
* commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5':
free the NPObject in NPP_Destroy.
Merge commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1' into eclair-mr2-plus-aosp
* commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1':
Cleanup the cache file when we decide not saving it.
Merge commit '1b9d7605df3c07998752b713d7f944bb925cb193'
* commit '1b9d7605df3c07998752b713d7f944bb925cb193':
If the DOM changes textfield focus, make the IME work properly.
Merge commit 'e26efa321c66716d58f3e338022caed8852af07e' into eclair-mr2-plus-aosp
* commit 'e26efa321c66716d58f3e338022caed8852af07e':
If the DOM changes textfield focus, make the IME work properly.
Fix for http://b/issue?id=2219166
Requires a change to external/webkit
Remove the old change to update the WebTextView when a key is pressed,
since the IME does not generate key events. Instead, when the focus
changes, and the IME is serving the WebTextView, immediately clear
the cursor and update the WebTextView, so the user can continue
typing.
Squash of the following:
services: MountService: Rework the way volume states are handled
MountService: Add new API for directly getting volume state via a mount point
Environment: Switch from using system property for external storage state.
MountService: Add support for UMS
MountService: Fix a few bugs
services: MountService: Add support for mount-on-insertion
services: MountService: Add some debugging around UMS
services: MountService: Fix some UMS bugs and clean-up startup mount code
Signed-off-by: San Mehat <san@google.com>
LocationManagerService was just checking if the string of (comma-separated)
Location Providers contained the provider we were interested in. This works
fine in normal cases, but breaks if we add a provider such as test_network.
Enabling test_network causes LocationManagerService to think that the network
provider is also enabled.
The code in Settings.Secure.isLocationProviderEnabled() checks for the commas
in the string as well, to make sure that a provider name which is a substring
of another provider name won't cause problems. It also centralizes the code
which reads the string.
Signed-off-by: Brad Larson <brad.larson@garmin.com>
Merge commit '014085a8727d7e10a4d39cba4a6d27826b66bc00'
* commit '014085a8727d7e10a4d39cba4a6d27826b66bc00':
Fix for a race condition that can occur if an utterance
