Merge commit '4b897aa99bf71f933f5b202c1531858382122d6f'
* commit '4b897aa99bf71f933f5b202c1531858382122d6f':
Making sure that there are no calls made to the native TTS
Merge commit '19e53f7ae506ccb294f46a36c70d7f3154b258ad'
* commit '19e53f7ae506ccb294f46a36c70d7f3154b258ad':
Delete global ref to the weak reference to the SynthProxy in the
Merge commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83'
* commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83':
Fixing a race condition that causes synthesis to not be aborted
Merge commit '83fa3565896ed19846f6498c00de3cc9a29b1a57'
* commit '83fa3565896ed19846f6498c00de3cc9a29b1a57':
Fixing a bug in how stop works - keep stop from always stopping
Merge commit 'b197021e160091897391cd27093c35bd3c22a7fc'
* commit 'b197021e160091897391cd27093c35bd3c22a7fc':
Making sure that the audio buffers for speech are cleared
* changes:
Fixing a bug in how stop works - keep stop from always stopping the currently speaking item if that item does not belong to the app that is trying to do the stop.
the currently speaking item if that item does not belong to the
app that is trying to do the stop.
Also adds back the functionality of globally stopping speech that
was lost when utterance IDs were added (needed by screen reader).
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.