summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2011-11-30 10:51:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 10:51:10 -0800
commit4f9787d6f4058a0f6df08456119edd2ae1b546cd (patch)
tree4e93ad32ce4fdf1b32a25698e6e077d23c47a0d9
parent993b2099cee5c3ad86a5fbbd29194994336187be (diff)
parent7dfb3e611a9b4db4ffadcaa18a833de083647159 (diff)
downloadframeworks_base-4f9787d6f4058a0f6df08456119edd2ae1b546cd.zip
frameworks_base-4f9787d6f4058a0f6df08456119edd2ae1b546cd.tar.gz
frameworks_base-4f9787d6f4058a0f6df08456119edd2ae1b546cd.tar.bz2
am 7dfb3e61: am cc084f1d: Fix superfluous onError callbacks.
* commit '7dfb3e611a9b4db4ffadcaa18a833de083647159': Fix superfluous onError callbacks.
-rw-r--r--core/java/android/speech/tts/AudioPlaybackHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/speech/tts/AudioPlaybackHandler.java b/core/java/android/speech/tts/AudioPlaybackHandler.java
index d452b8e..518c937 100644
--- a/core/java/android/speech/tts/AudioPlaybackHandler.java
+++ b/core/java/android/speech/tts/AudioPlaybackHandler.java
@@ -428,7 +428,8 @@ class AudioPlaybackHandler {
final AudioTrack audioTrack = params.getAudioTrack();
if (audioTrack == null) {
- params.getDispatcher().dispatchOnError();
+ // There was already a call to handleSynthesisDone for
+ // this token.
return;
}