Merge commit 'b197021e160091897391cd27093c35bd3c22a7fc'
* commit 'b197021e160091897391cd27093c35bd3c22a7fc':
Making sure that the audio buffers for speech are cleared
Merge commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682'
* commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682':
Implementing utterance ID callbacks for silence and pre-recorded files
Merge commit '3a27b29e41777e58fbcdca440a00676915ebea4f'
* commit '3a27b29e41777e58fbcdca440a00676915ebea4f':
Make VPN connect even when DNS is not present and other fixes.
* Changes:
+ As title.
+ Add two new states to VpnState: UNKNOWN and UNUSABLE.
+ Add more debug messages when stopping a service and when DNS being
overridden.
Merge commit '334b861e3339bc7189372f790d0c0e2043d160a3'
* commit '334b861e3339bc7189372f790d0c0e2043d160a3':
Propagate optional audio stream type to the creation of the audio resources
* Changes
+ Add VpnConnectingError.java.
+ Broadcast the error returned by daemons.
+ Add error codes to VpnManager.java.
+ Add error code to VpnManager.broadcastConnectivity().
Patch Set 4:
+ Replace VPN_UP with VPN_STATUS in response to ip-up-vpn changes.
+ Make VpnServiceBinder a foreground service so that it won't be
interrupted by the system.
Patch Set 5:
+ Remove the support of returning 0 from daemon and restart socket in
AndroidServiceProxy.
Merge commit 'd48ca22b9fcea38b112aedb4126f3d030594af47'
* commit 'd48ca22b9fcea38b112aedb4126f3d030594af47':
Use the TTS queue constants in the TTS service as defined in the
Merge commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71'
* commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71':
Adding tagging to utterances to track which app said what.
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'
* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
Adding a lock to stop so that stop will stop utterances
Merge commit 'c52d55c5404a09a3845a322f50577fc4c125a86d'
* commit 'c52d55c5404a09a3845a322f50577fc4c125a86d':
Move the watchdog timer to a separate thread...
Optimize backups by writing an entity only if the checksum of the data has changed.
Call into the hidden AudioService API to apply changed audio settings.
After restoring wifi data, make sure that the permissions and ownership are set
properly for the supplicant process to access it.
Locale isn't restoring properly - TODO added.
Also backup development settings MOCK_LOCATION and USB_DEBUGGING.
Backup and restore more of the Audio settings. Won't work yet without a reboot.
Disable Wifi supplicant restore temporarily. It seems to be disabling Wifi due to
permissions problems.
Don't restore Ringtones.
Merge commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193'
* commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193':
Use the current Locale as the default language when TTS settings are not
* changes:
Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
