commit 718808abe910ac260fabac1fec97b04a7c5b7bd1
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 12 20:09:12 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 12 20:09:12 2015 -0700
tree 13b40285f37d971c52e0dc595f3df4f863a4a38a
parent 3e9f240cb39e86699b6fb5cf86ec87d2a2deee96
parent bfeca7f41a1068d5324a60835087bff0e1098aee

Merge "audiopolicy: Fix to close all opened inputs in closeAllInputs"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 85a7393..8d32f66 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1913,8 +1913,8 @@
 void AudioPolicyManagerCustom::closeAllInputs() {
     bool patchRemoved = false;
 
-    for(size_t input_index = 0; input_index < mInputs.size(); input_index++) {
-        sp<AudioInputDescriptor> inputDesc = mInputs.valueAt(input_index);
+    for(size_t input_index = mInputs.size(); input_index > 0; input_index--) {
+        sp<AudioInputDescriptor> inputDesc = mInputs.valueAt(input_index-1);
         ssize_t patch_index = mAudioPatches.indexOfKey(inputDesc->mPatchHandle);
         if (patch_index >= 0) {
             sp<AudioPatch> patchDesc = mAudioPatches.valueAt(patch_index);
@@ -1925,8 +1925,8 @@
         if ((inputDesc->mIsSoundTrigger) && (mInputs.size() == 1)) {
             ALOGD("Do not close sound trigger input handle");
         } else {
-            mpClientInterface->closeInput(mInputs.keyAt(input_index));
-            mInputs.removeItem(mInputs.keyAt(input_index));
+            mpClientInterface->closeInput(mInputs.keyAt(input_index-1));
+            mInputs.removeItem(mInputs.keyAt(input_index-1));
         }
     }
     nextAudioPortGeneration();