commit 8be8f7c2cbe835b62a1683fb650ebfb305832905
author Carter Hsu <carterhsu@google.com> Wed May 15 22:45:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 15 22:45:17 2019 -0700
tree 1ff0093e825e377486e071da6cb619d6aeb6a55b
parent 5479d8159ae3f2781a3494124d8cf1e81e1c4583
parent 7d2b305d230eca482f3da35554dbfbdff588d19d

Merge "audio: fix index of input vector" into qt-dev am: a6d436ca27 am: f97cace8e6
am: 7d2b305d23

Change-Id: Ibc3d7a12b088e05f02c356c6f14f83b4ac7ed95d

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 87ab573..a8645b8 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2135,6 +2135,7 @@
         for (size_t i = 0; i < mInputs.size(); ) {
             sp <AudioInputDescriptor> desc = mInputs.valueAt(i);
             if (desc->mProfile != profile) {
+                i++;
                 continue;
             }
             // if sound trigger, reuse input if used by other sound trigger on same session