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

Fix issue when QUEUE_DESTROY arrive at the same time.

Browse Source 
When multiple QUEUE_DESTROY messages arrive in a short timespan, some
messages were not flushed. This is because every QUEUE_DESTROY message
resets mFlushAll just before it starts playing itself. The solution
is to keep a counter of the amount of flushes that are still behind it on
the queue and keep flushing until the last one is reached.

Bug: 27555444
Change-Id: Ic24aa2250bf684e74b541907e4c57e0d5f0069ca
This commit is contained in:
Niels Egberts
2016-04-07 12:34:55 +01:00
parent 7492e75ba3
commit 10db95b316
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/speech/tts/TextToSpeechService.java
View File

@@ -457,8 +457,17 @@ public abstract class TextToSpeechService extends Service {
private class SynthHandler extends Handler {
private SpeechItem mCurrentSpeechItem = null;
private ArrayList<Object> mFlushedObjects = new ArrayList<Object>();
private boolean mFlushAll;
// When a message with QUEUE_FLUSH arrives we add the caller identity to the List and when a
// message with QUEUE_DESTROY arrives we increment mFlushAll. Then a message is added to the
// handler queue that removes the caller identify from the list and decrements the mFlushAll
// counter. This is so that when a message is processed and the caller identity is in the
// list or mFlushAll is not zero, we know that the message should be flushed.
// It's important that mFlushedObjects is a List and not a Set, and that mFlushAll is an
// int and not a bool. This is because when multiple messages arrive with QUEUE_FLUSH or
// QUEUE_DESTROY, we want to keep flushing messages until we arrive at the last QUEUE_FLUSH
// or QUEUE_DESTROY message.
private List<Object> mFlushedObjects = new ArrayList<>();
private int mFlushAll = 0;
public SynthHandler(Looper looper) {
super(looper);
@@ -467,7 +476,7 @@ public abstract class TextToSpeechService extends Service {
private void startFlushingSpeechItems(Object callerIdentity) {
synchronized (mFlushedObjects) {
if (callerIdentity == null) {
mFlushAll = true;
mFlushAll += 1;
} else {
mFlushedObjects.add(callerIdentity);
}
@@ -476,7 +485,7 @@ public abstract class TextToSpeechService extends Service {
private void endFlushingSpeechItems(Object callerIdentity) {
synchronized (mFlushedObjects) {
if (callerIdentity == null) {
mFlushAll = false;
mFlushAll -= 1;
} else {
mFlushedObjects.remove(callerIdentity);
}
@@ -484,7 +493,7 @@ public abstract class TextToSpeechService extends Service {
}
private boolean isFlushed(SpeechItem speechItem) {
synchronized (mFlushedObjects) {
return mFlushAll || mFlushedObjects.contains(speechItem.getCallerIdentity());
return mFlushAll > 0 || mFlushedObjects.contains(speechItem.getCallerIdentity());
}
}