Merge "A few TTS bug fixes"
diff --git a/api/current.txt b/api/current.txt
index ed5f156..569b206 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17603,7 +17603,7 @@
method public boolean isSpeaking();
method public int playEarcon(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>);
method public int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>);
- method public int setEngineByPackageName(java.lang.String);
+ method public deprecated int setEngineByPackageName(java.lang.String);
method public int setLanguage(java.util.Locale);
method public int setOnUtteranceCompletedListener(android.speech.tts.TextToSpeech.OnUtteranceCompletedListener);
method public int setPitch(float);
diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java
index 8923b46..6823b73 100755
--- a/core/java/android/speech/tts/TextToSpeech.java
+++ b/core/java/android/speech/tts/TextToSpeech.java
@@ -1055,13 +1055,15 @@
/**
* Sets the TTS engine to use.
*
+ * @deprecated This doesn't inform callers when the TTS engine has been
+ * initialized. {@link #TextToSpeech(Context, OnInitListener, String)}
+ * can be used with the appropriate engine name.
+ *
* @param enginePackageName The package name for the synthesis engine (e.g. "com.svox.pico")
*
* @return {@link #ERROR} or {@link #SUCCESS}.
*/
- // TODO: add @Deprecated{This method does not tell the caller when the new engine
- // has been initialized. You should create a new TextToSpeech object with the new
- // engine instead.}
+ @Deprecated
public int setEngineByPackageName(String enginePackageName) {
mRequestedEngine = enginePackageName;
return initTts();