History log of /frameworks/base/core/java/android/speech/tts/TextToSpeech.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1e13a02320aa165c22172d43b2b3c3cd8ad35cf7 21-Jan-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 3365937 notify TTS initialization listener of binding errors

The creation of a TextToSpeech object causes the TTS service to
start, and the initialization listener to be called when the
service is connected. But the listener is never called when
the service binding failed to be notified of this error.
The fix consists in checking the result of the bind to service
operation, and notify the listener in case of an error.

More log was added in case speak() and synthesizeToFile() are
called but the service is not known to have started.

Change-Id: I7dcc1fa44be31fee3177ec6215fca3306377b934
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
4a60d61887a20d349e5eb38900dfbcaab06630fc 27-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix NPE in TextToSpeech with setLanguage(null)

getLanguage() can return null, and pass it to setLanguage()
in TextToSpeech.initTts()

Change-Id: I8046e94959404bd63b0a90bcc2dbf4018f77c110
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
6df44727d06548015e741dd8f63716602ed1e5d1 30-Mar-2010 Charles Chen <clchen@google.com> Unhiding TTS API constants and methods needed for TTS plugin support.
This is a fix for bug #2548048

Change-Id: Ieb60979098c1d2e82618204882bd523d271a8784
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
1a2712ce2a18eba6809d984d2f7443fbdccaa7ed 02-Apr-2010 Charles Chen <clchen@google.com> Fix for bug 2564771 - pitch setting between apps can
interfere with one another.

Root cause was not caching all the params that were needed.
This change fixes that bug as well as related bugs for remembering
the default engine and for making sure that the right engine is
loaded when checking for language availability.

Change-Id: I2a76da8faec8112036e68d27539db444c53a1509
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
42229259a6fca8851db74dc1c0ecbab2d3fb788d 30-Mar-2010 Charles Chen <clchen@google.com> Fix for bug 2548048 - it was impossible for applications to discover
if their TTS settings were being overridden by the user or not.

Change-Id: I28856a1b79c9455435671d13ed614a1ccb4e95ea
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
def7185cf19d48c95b50c2b83503d5cd21a613bf 26-Mar-2010 Charles Chen <clchen@google.com> Cherry-picking this fix into Froyo.

This fix is part of addressing bug #2548048

Making it possible to determine which TTS engine is currently set
as the default by the user.

Change-Id: Ifa422f43a33498b94d96811078c0794d64668357
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
b21651c10ca833e073337ae6a0ee55fcc39c32f1 04-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2481825
When TTS is synthesizing to a file, return an error if the file
cannot be created.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
6a8b73be572f37b471322e7d49b44c3783633d96 02-Mar-2010 Charles Chen <clchen@google.com> Fixing a bug with TTS that caused TTS to ignore the default settings
unless the user had set the defaults to always override app settings.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
f1e245f7408f18cbb21430abf05a5407d03cfe07 12-Feb-2010 Charles Chen <clchen@google.com> Hiding the new TextToSpeech Intent extras for voice data check
to fix the build.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
76d9c3cb4f6f8c027959d2951e35a8b37762a1f3 12-Feb-2010 Charles Chen <clchen@google.com> Adding Intent extra strings to TextToSpeech.Engine for doing
voice data checks.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
60dd360640a400d9b4a602160733281d284aaee5 08-Jan-2010 Charles Chen <clchen@google.com> Enabling multiple apps to use different speech synthesis engines and not
interfere with one another.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
b4fbe768f8bfb2550dec100e29d0edc09b8a051a 19-Nov-2009 Charles Chen <clchen@google.com> Adding the ability to specify the speech synthesis
engine to use for text-to-speech.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
a9b417e9bfea3da908884c726ffc9bf4f64691cf 12-Sep-2009 Jean-Michel Trivi <jmtrivi@google.com> TextToSpeech javadoc update.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
9f5eadd2eed8b95c077a15d9e3e3c66fd151c215 15-Aug-2009 Jean-Michel Trivi <jmtrivi@google.com> Unhide the broadcast intent that signals completion of the TTS language
files. This is required for bug 2022435.
Correct the javadoc where two intents were mislabelled as broadcast,
but were activity actions.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
69e67a3e2e863fa8828151ef3a488bfcaa504f7a 11-Aug-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2043140.
A race condition is encountered when an application invokes shutdown()
on its TextToSpeech object while is has speak() requests still running.
Since the TTS service destructor releases the synthesizer resources and
sets the corresponding synth reference to null, an NPE was observed.
The fix consists in catching NPEs whenever the sNativeSynth object is
accessed, and return the matching error for the call.
This change is a "low risk" version of the fix for bug 2025765i (same
issue) which was reverted because it was higher risk than this CL:
it affected the logic of each call to sNativeSynth. This CL only sets
an error code when an NPE is fired because sNativeSynth is null.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
77a5d39343760d9950ca15a87db0ae778afb4f2b 08-Aug-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2022435.
Add new intent and matching extra to signal the completion of the
language pack installer. This is used by CL 20513.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
ed06578eddde07abe325fa4c92910bb7246cd49f 28-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2017664
Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention.
Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine.
Renamed the TextToSpeech.Engine constants that are used as extras for the
ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_.
Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of
"TTS" in the name.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
9c53a5c01f7d9e2ffe93cc7ca03cac9c71968484 22-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Resetting the setLanguage() call to its intended behavior after change 8089
which works around the bug where a language cannot be set if the default
language (which is loaded upon initialization) isn't eng-USA.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
1126aad736f3322559007b8abc49e26f550e4b54 21-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Revert the setLanguage() call to its previous implementation as
waiting to change the language right before a call to speak can
put the engine in an unstable state.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
5e11a6ad00b062d604b30578e0fb412ae4586989 20-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> 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.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
904dfa588431ff7c99c337d7797f5bef9ac12ce3 15-Jul-2009 Charles Chen <clchen@google.com> Adding missing addEarcon method. Not having this was a bug as
this method is needed to add earcons; otherwise, there is
nothing for playEarcon to play.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
62253a319d6359ce71c547d0b0aa36ba17789ab4 14-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Unhide required definitions in TextToSpeech.Engine that cover return codes and
extras for android.intent.action.CHECK_TTS_DATA intent, and the key values
for the parameter hashmap that can be passed by an application in speak(),
synthesizeToFile(), playSilence() and playEarcon().
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
78c9d0d2c5eb4d5687ae7cbe41155159329ad68f 14-Jul-2009 Charles Chen <clchen@google.com> Adding Utterance ID to the TtsService.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
630a8de44fa0ca855c4a87d939432f831e8ed531 11-Jul-2009 Charles Chen <clchen@google.com> Fixing TTS breakage.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
a981013aa7315e13c6c5f6aad489813c419031ea 10-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Add support in TextToSpeech for an audio stream type param and utterance
ID specified as a hashmap param in the synthesis calls.
Fix a bug where the cached parameters were not passed to the service
when synthesizing to a file.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
a9c5e4bf2639f8f09be8bace4230613b7b689f0e 10-Jul-2009 Charles Chen <clchen@google.com> Adding tagging to utterances to track which app said what.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
748efcc3fb1b369690ab4617a04f452b1832edf4 09-Jul-2009 Charles Chen <clchen@google.com> Adding a missing catch
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
e28aced7bb96b086b16df82ff9c75b08671eb7df 08-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Remove unused definitions for default language in TextToSpeech as
the default language is determined by the current Locale, not a hardcoded
value. Add a value for the default TTS engine to use.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
da7681e7b61dd450be72f2b4a80e6d1c86342e05 08-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Optimize storing of cached TTS parameters. Initialize the cached
language settings with the current Locale.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
c8ba3b560ce0ce5944939a50d61f639fdcaa0015 07-Jul-2009 Charles Chen <clchen@google.com> Propagating error codes to TextToSpeech.java
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
52ae06521a8d4c48757b126cff233f037d0a16ba 07-Jul-2009 Charles Chen <clchen@google.com> Fixes a compatibility issue with users that have the old TTS
installed already.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
62788e9b48f884a35b89c88911b581daa6a14e08 03-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Unhide android.speech.tts.TextToSpeech
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
99a0feecd0f0aad314d7a4637d329b8a9e8c1150 02-Jul-2009 Charles Chen <clchen@google.com> Adding strings for data root and data files - these are needed
for returning this information in an Intent from checkVoiceData.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
ddb0a803fd353fbaf0139cc8804499bc9dce7403 30-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> Adding in TTS service support for language query and level of support.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
5c22f516be7753859f62ca3ff5327c453ee26faa 30-Jun-2009 Charles Chen <clchen@google.com> Adding status return codes for TTS calls.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
d4989093ed708ddf9c799655ea0af7afda726426 27-Jun-2009 Charles Chen <clchen@google.com> Adding implementation of IPA to the TextToSpeech.java
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
f032bc7da536774a0b6a1c77632c65b935eee6fa 26-Jun-2009 Charles Chen <clchen@google.com> Adding in the playSilence method to TextToSpeech.java
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
87c9684fd0fa31fd6ad7f7e9f4cfedddc4fdc4b0 25-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> Add caching of the speech rate and language in android.speech.tts.TextToSpeech
so the speech params can be passed along in calls for text synthesis.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
aaf842edbfe76990413d4c002acb394f855321b5 25-Jun-2009 Charles Chen <clchen@google.com> Updating the TextToSpeech.java with skeleton methods.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
2ea5349583de4a505501530d04133524bb6d5d38 23-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> Adding support for pitch changes of the synthesized text in Text-To-Speech.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
d146874d7341bc9602c93719582b4209e7b81f01 18-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> Grouping under TextToSpeech.Engine the constants to be used by
a TTS engine implementation or a settings application for default
values, and data integrity check return codes.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
679d728f09eeab2f8b882e42f6e081db1ac74996 17-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> 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.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
91bf30a4779146a14b2c9c5ce168d641cd31cb8e 11-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> TextToSpeech class cleanups
- harmonized private member variable names
- added success / failure codes (used for now in initialization)
- synchronized access to speech completed listener.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
a8518c169bb34e540b7542ad5bd3891053d01a9f 11-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> Renaming the Tts class to TextToSpeech for clarity.
Switching to HashMap for parameter lists to pass key-value parameter pairs.
Using TODO instead of FIXME in comments.
Removing methods that don't belong anymore to the TTS interface now the feature
becomes part of the platform.
/frameworks/base/core/java/android/speech/tts/TextToSpeech.java