commit 7165268ffa6c7b6b405b6afad82e2a346500e8ee
author Glenn Kasten <gkasten@google.com> Wed Aug 14 15:17:55 2013 -0700
committer Glenn Kasten <gkasten@google.com> Fri Aug 16 14:10:13 2013 -0700
tree ec120fa6844211de77859c5199cc2382ff2cab53
parent b86432b1d62e7c9034223f0120b9bceb44215c41

Don't lock and then immediately unlock effect chains

Change-Id: Id9a4b1e9c49cecfd3a008a7814b5c14dad9a5831

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 1564a44..8bc70ba 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4283,7 +4283,8 @@
                 break;
 
             case TrackBase::IDLE:
-                break;
+                doSleep = true;
+                continue;
 
             default:
                 LOG_FATAL("Unexpected activeTrackState %d", activeTrackState);
@@ -4293,12 +4294,8 @@
         }
 
         // thread mutex is now unlocked, mActiveTrack unknown, activeTrack != 0, kept, immutable
-        // activeTrack->mState unknown, activeTrackState immutable
-        if (activeTrackState != TrackBase::ACTIVE && activeTrackState != TrackBase::RESUMING) {
-            unlockEffectChains(effectChains);
-            doSleep = true;
-            continue;
-        }
+        // activeTrack->mState unknown, activeTrackState immutable and is ACTIVE or RESUMING
+
         for (size_t i = 0; i < effectChains.size(); i ++) {
             // thread mutex is not locked, but effect chain is locked
             effectChains[i]->process_l();