Merge commit '841ed8596a745d90822467bc2c0e13880bb59cc9'
* commit '841ed8596a745d90822467bc2c0e13880bb59cc9':
Reset the speech synth singleton to null when the service is destroyed
Merge commit '22726cf8174fe00a097c89b8da397b10626cdd00'
* commit '22726cf8174fe00a097c89b8da397b10626cdd00':
Return error codes for storing the key/cert in addPkcs12Keystore()
* changes:
Reset the speech synth singleton to null when the service is destroyed so it can be recreated when the service is initialized. In the interface with the native synthesizer library, close the lib in the finalizer, delete the global ref to the SynthProxy java object.
Merge commit '6fb608ee67c3ad82baf2253b87b63fff8907992a'
* commit '6fb608ee67c3ad82baf2253b87b63fff8907992a':
Issue #1884058 (Need to only record frequency and duration for selected Google apps)
Merge commit '69a841a1649390d68b32b3bcf0c429a60c400cfa'
* commit '69a841a1649390d68b32b3bcf0c429a60c400cfa':
Make sure the speech synthesizer proxy is a singleton in the TTS service.
Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'
* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
Add logging to help track down intermittent bug
Merge commit '1126aad736f3322559007b8abc49e26f550e4b54'
* commit '1126aad736f3322559007b8abc49e26f550e4b54':
Revert the setLanguage() call to its previous implementation as
Merge commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be'
* commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be':
Define a broadcast intent for the web search provider changing. Unhide
Merge commit '3b5449e90247e77c173d7bbdd4d5e49ad856afe1'
* commit '3b5449e90247e77c173d7bbdd4d5e49ad856afe1':
* Don't clip the display if LAYOUT_NO_LIMITS is specified (as with PhoneWindowmanager does)
* changes:
* Don't clip the display if LAYOUT_NO_LIMITS is specified (as with PhoneWindowmanager does) * FullScreen mode was not hiding status bar for app in compatibility mode * fixed fillsScreenLw to take compatibility window into account * Fixed the logic in needsBackgroundFiller to be consistent with other places. * Fix NPE in WindowManagerService#applyAnimationLocked LayoutParam can be null.
Merge commit '592f1a65815598f705260df9dbe5488e3990b45d'
* commit '592f1a65815598f705260df9dbe5488e3990b45d':
Prevent the setLanguage() method in TextToSpeech to change the language
* changes:
Prevent the setLanguage() method in TextToSpeech to change the language for all current TextToSpeech instances by only caching the language value so it is used with each subsequent utterance for this instance. Synchronize calls to the engine around a global mutex since the engine isn't thread-safe, except for the stop() call which is meant to interrupt the synthesis loop.
Merge commit '2acbec4918db4ab6eca32cf427ffd771c9efe35f'
* commit '2acbec4918db4ab6eca32cf427ffd771c9efe35f':
add comment to illuminate why we only dismiss the dialog when launching an intent for in app search
Merge commit '9ff71d38a060476ba19deacf12ddaeef3cbac00d'
* commit '9ff71d38a060476ba19deacf12ddaeef3cbac00d':
whoops, still need to dismiss when launching an intent for in-app search
