Merge commit 'ee513b600efeb55040030a3dc9c8e7ef74b36149'
* commit 'ee513b600efeb55040030a3dc9c8e7ef74b36149':
In the native layer for the TTS service, delete the data allocated for the callback after the signal for the end of the synthesis has been received.
* changes:
In the native layer for the TTS service, delete the data allocated for the callback after the signal for the end of the synthesis has been received.
Merge commit '2f437b4c56db1750cc6cb3d1ad549a79049b6370'
* commit '2f437b4c56db1750cc6cb3d1ad549a79049b6370':
Adding splitting to the TTS to guard against extremely long strings.
* Changes
+ Add PptpProfile.java, PptpService.java.
+ Add L2tpIpsecPskProfile.java
+ Add PPTP and L2TP_IPSEC_PSK entries in VpnType.java.
+ Add the secret option to L2tpProfile.java and have L2tpIpsecProfile
extend it.
+ Add MtpdHelper to send common PPP options.
+ Add getGatewayIp() to VpnService().
+ Revise VpnService.reallyGetHostIp().
Patch Set 6, 7, 8:
+ Add L2TP secret flag in L2tpProfile.
Patch Set 9:
+ Add description to VpnType.
Patch Set 11:
+ Pass ipparam to mtpd.
Patch Set 12:
+ Add L2TP secret support
+ Fix string constants
Merge commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7'
* commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7':
Using a sendBroadcast to notify interested parties of when
These changes are the frameworks/base portion of CDMA UI changes.
Five settings are added:
- In-call DTMF type (burst or long)
- Emergency tone type
- CDMA auto-retry
- Hearing Aid Compatibility (on/off)
- TTY mode
Merge commit 'e181409ced966f2bea6128bf32b0334e34fcf58c'
* commit 'e181409ced966f2bea6128bf32b0334e34fcf58c':
Fixing the synth function so that queue processing continues.
Merge commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5'
* commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5':
Fix bug in TTS service where the language setting was using the default language
* changes:
- clean up the sync settings names to: (get|set)SyncAutomatically (get|set)MasterSyncAutomatically - change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that this overrides the .*SyncAutomatically settings - make ContentResolver methods that call the sync controls methods in IContentService so that SDK users can use them - rename startSync to requestSync to reinforce the fact that a sync is not immediately or always started when this method is called - add an Account parameter to all the sync settings and control methods - change the sync control methods to take a String authority rather than a Uri uri
(get|set)SyncAutomatically
(get|set)MasterSyncAutomatically
- change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that
this overrides the .*SyncAutomatically settings
- make ContentResolver methods that call the sync controls methods
in IContentService so that SDK users can use them
- rename startSync to requestSync to reinforce the fact that a sync
is not immediately or always started when this method is called
- add an Account parameter to all the sync settings and control methods
- change the sync control methods to take a String authority rather than a Uri uri
Merge commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652'
* commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652':
Adding support for pitch changes of the synthesized text in Text-To-Speech.
Merge commit '7153739a92dda971fd865defae0747bec921d8af'
* commit '7153739a92dda971fd865defae0747bec921d8af':
Grouping under TextToSpeech.Engine the constants to be used by
Merge commit 'e748161ca89867e8c57d4e71c780486d4de8039c'
* commit 'e748161ca89867e8c57d4e71c780486d4de8039c':
In the TTS service, read the default TTS settings from Settings.Secure.
Merge commit 'a0a854d47f9dc38ce41505f973aea01842694fb5'
* commit 'a0a854d47f9dc38ce41505f973aea01842694fb5':
Using Locale to specify language and country for a TTS language to load,
* changes:
Using Locale to specify language and country for a TTS language to load, rather than a String. Cleanup in doc for TextToSpeech, and addition of queue mode constants.
Merge commit 'f1170fb5386ea86d704480d321ee9d1ee4858244'
* commit 'f1170fb5386ea86d704480d321ee9d1ee4858244':
Updating TTS engine interface for setting the language based on language, country and variant codes
* changes:
Updating TTS engine interface for setting the language based on language, country and variant codes coming from a java.util.Locale instance.
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'
* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'
* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
Remove obsolete FOTA_UPDATE permission (which should never have been
reintroduced in an errant and clumsy git merge operation.
Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.
made public, and wouldn't be used by any third party applications,
and no longer does anything regardless).
Also remove the WRITE_GSERVICES permission from the SettingsProvider
package's manifest (the declaration there was redundant with the one
in the core manifest, where all the other settings-related permissions
live -- no other core package includes its own permission definitions).
