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

Fixing a race condition in the TextToSpeech service that could be

Browse Source 
triggered if many long utterances are started and interrupted in
rapid succession.
This commit is contained in:
Charles Chen
2010-02-05 21:36:07 -08:00
parent 6b31e4d21f
commit 44afb7be73
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/TtsService/src/android/tts/TtsService.java
View File

@@ -133,6 +133,7 @@ public class TtsService extends Service implements OnCompletionListener {
private HashMap<String, ITtsCallback> mCallbacksMap;
private Boolean mIsSpeaking;
private Boolean mSynthBusy;
private ArrayList<SpeechItem> mSpeechQueue;
private HashMap<String, SoundResource> mEarcons;
private HashMap<String, SoundResource> mUtterances;
@@ -168,6 +169,7 @@ public class TtsService extends Service implements OnCompletionListener {
mSelf = this;
mIsSpeaking = false;
mSynthBusy = false;
mEarcons = new HashMap<String, SoundResource>();
mUtterances = new HashMap<String, SoundResource>();
@@ -733,10 +735,11 @@ public class TtsService extends Service implements OnCompletionListener {
try {
synthAvailable = synthesizerLock.tryLock();
if (!synthAvailable) {
mSynthBusy = true;
Thread.sleep(100);
Thread synth = (new Thread(new SynthThread()));
//synth.setPriority(Thread.MIN_PRIORITY);
synth.start();
mSynthBusy = false;
return;
}
int streamType = DEFAULT_STREAM_TYPE;
@@ -821,10 +824,11 @@ public class TtsService extends Service implements OnCompletionListener {
try {
synthAvailable = synthesizerLock.tryLock();
if (!synthAvailable) {
mSynthBusy = true;
Thread.sleep(100);
Thread synth = (new Thread(new SynthThread()));
//synth.setPriority(Thread.MIN_PRIORITY);
synth.start();
mSynthBusy = false;
return;
}
String language = "";
@@ -959,6 +963,12 @@ public class TtsService extends Service implements OnCompletionListener {
private void processSpeechQueue() {
boolean speechQueueAvailable = false;
synchronized (this) {
if (mSynthBusy){
// There is already a synth thread waiting to run.
return;
}
}
try {
speechQueueAvailable =
speechQueueLock.tryLock(SPEECHQUEUELOCK_TIMEOUT, TimeUnit.MILLISECONDS);