commit 2e4655ad2ca683f28dce6dcbd92198676f52ec3f
author Haynes Mathew George <hgeorge@codeaurora.org> Thu Jan 05 15:01:53 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 06 17:05:22 2017 -0800
tree bd9d9bc120b66017411b90cfcee06363126efc80
parent 8c73d679e19d5dd4222da2188afd3773c8549800

policy_hal: Revert sound trigger changes related to device switch

Revert the synchronization fix handled in
Changed-Id: I9f1c4f82b84805b5f7a0aa770b333e7f2aeee21c
as it's already handled as part of upstream soundtrigger
AOSP refresh

CRs-Fixed: 1108103
Change-Id: I796230b2e1f5e02ed84e29eebc0e7d7be54c1842

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index b139a86..0e9aeae 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -2231,13 +2231,7 @@
             mAudioPatches.removeItemsAt(patch_index);
             patchRemoved = true;
         }
-        if ((inputDesc->getOpenRefCount() > 0) && inputDesc->isSoundTrigger()
-            && (mInputs.size() == 1)) {
-            ALOGD("Do not close sound trigger input handle");
-        } else {
-            mpClientInterface->closeInput(mInputs.keyAt(input_index-1));
-            mInputs.removeItem(mInputs.keyAt(input_index-1));
-        }
+        mpClientInterface->closeInput(mInputs.keyAt(input_index-1));
     }
     mInputs.clear();
     SoundTrigger::setCaptureState(false);