commit 18265202049bfa53fe5b18a95d956325acca9c7b
author Eric Laurent <elaurent@google.com> Sat Dec 06 01:04:51 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 06 01:04:52 2014 +0000
tree 5260bab90009d52dacdd82cad7d59630fadd0b64
parent a147c17adabaab819ac108fbc448c49525cf74bc
parent 0add0fd07401c507a77b37868f46a2ae587c30df

Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-dev

services/audiopolicy/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index 3778704..8bb35f9 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -2650,13 +2650,10 @@
 
 void AudioPolicyManager::clearAudioPatches(uid_t uid)
 {
-    for (ssize_t i = 0; i < (ssize_t)mAudioPatches.size(); i++)  {
+    for (ssize_t i = (ssize_t)mAudioPatches.size() - 1; i >= 0; i--)  {
         sp<AudioPatch> patchDesc = mAudioPatches.valueAt(i);
         if (patchDesc->mUid == uid) {
-            // releaseAudioPatch() removes the patch from mAudioPatches
-            if (releaseAudioPatch(mAudioPatches.keyAt(i), uid) == NO_ERROR) {
-                i--;
-            }
+            releaseAudioPatch(mAudioPatches.keyAt(i), uid);
         }
     }
 }