commit e3722cb3364c3b5dab450067a13901e90291b46d
author Glenn Kasten <gkasten@google.com> Thu Nov 15 15:05:51 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 15 15:05:51 2012 -0800
tree 86698a644c56fa13dd22939f7b99a4dd642be9fd
parent de5191e8b02f727756eb9d6e812af415d6cd0768
parent 5b78fc92d9e64623be66a5c3031b54dcd8ed28f9

Merge "Static AudioTrack plays twice initially"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 10f4410..5bb599b 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -4710,7 +4710,7 @@
     if (thread != 0) {
         Mutex::Autolock _l(thread->mLock);
         if (mState != STOPPING_1 && mState != STOPPING_2 && mState != STOPPED && mState != PAUSED &&
-                mState != PAUSING) {
+                mState != PAUSING && mState != IDLE && mState != FLUSHED) {
             return;
         }
         // No point remaining in PAUSED state after a flush => go to