Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgot to deprecate a method in current.txt before merging earlier change.

Browse Source 
Also includes a comment fix and line size changes in TextToSpeech.java.

Change-Id: Ia5842b694bca6cd9cae035164ffc605451e72d8b
This commit is contained in:
Niels Egberts
2014-07-02 16:41:34 +01:00
parent df7deefe8e
commit 795d777ee1
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -26613,7 +26613,7 @@ package android.speech.tts {
method public int playEarcon(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String);
method public deprecated 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>, java.lang.String);
method public int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>);
method public deprecated int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>);
method public deprecated int setEngineByPackageName(java.lang.String);
method public int setLanguage(java.util.Locale);
method public deprecated int setOnUtteranceCompletedListener(android.speech.tts.TextToSpeech.OnUtteranceCompletedListener);
@@ -26624,8 +26624,8 @@ package android.speech.tts {
method public int speak(java.lang.CharSequence, int, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String);
method public deprecated int speak(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>);
method public int stop();
method public deprecated int synthesizeToFile(java.lang.String, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String);
method public int synthesizeToFile(java.lang.CharSequence, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String, java.lang.String);
method public deprecated int synthesizeToFile(java.lang.String, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String);
field public static final java.lang.String ACTION_TTS_QUEUE_PROCESSING_COMPLETED = "android.speech.tts.TTS_QUEUE_PROCESSING_COMPLETED";
field public static final int ERROR = -1; // 0xffffffff
field public static final int ERROR_INVALID_REQUEST = -8; // 0xfffffff8

14
core/java/android/speech/tts/TextToSpeech.java
View File

@@ -1039,7 +1039,8 @@ public class TextToSpeech {
*/
@Deprecated
public int speak(final String text, final int queueMode, final HashMap<String, String> params) {
return speak(text, queueMode, params, params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID));
return speak(text, queueMode, params,
params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID));
}
/**
@@ -1109,7 +1110,8 @@ public class TextToSpeech {
@Deprecated
public int playEarcon(final String earcon, final int queueMode,
final HashMap<String, String> params) {
return playEarcon(earcon, queueMode, params, params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID));
return playEarcon(earcon, queueMode, params,
params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID));
}
/**
@@ -1138,7 +1140,8 @@ public class TextToSpeech {
return runAction(new Action<Integer>() {
@Override
public Integer run(ITextToSpeechService service) throws RemoteException {
return service.playSilence(getCallerIdentity(), durationInMs, queueMode, utteranceId);
return service.playSilence(getCallerIdentity(), durationInMs,
queueMode, utteranceId);
}
}, ERROR, "playSilence");
}
@@ -1165,12 +1168,13 @@ public class TextToSpeech {
*
* @return {@link #ERROR} or {@link #SUCCESS} of <b>queuing</b> the playSilence operation.
* @deprecated As of API level 20, replaced by
* {@link #playEarcon(String, int, HashMap, String)}.
* {@link #playSilence(String, int, HashMap, String)}.
*/
@Deprecated
public int playSilence(final long durationInMs, final int queueMode,
final HashMap<String, String> params) {
return playSilence(durationInMs, queueMode, params, params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID));
return playSilence(durationInMs, queueMode, params,
params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID));
}
/**