commit 54177c4a36686ed6db406787e8a419030e02a56f
author Chaithanya Krishna Bacharaju <chaithan@codeaurora.org> Mon Sep 14 15:05:09 2015 +0530
committer Chaithanya Krishna Bacharaju <chaithan@codeaurora.org> Mon Sep 21 11:38:30 2015 +0530
tree 64de66c1df1b07d0b1ec780b323369f8af95feed
parent 95333359b939d4e4b4a546d6f38e2f82258f8b31

audiopolicy: Do not close SoundTrigger input in CloseAllInputs

During device connect or disconnect, closeAllInputs is called and
all active inputs are closed. This needs to be ignored in case of
sound trigger session as it uses same io handle throughout.
Using same handle causes startInput on new session to fail if
releaseInput happens on previous session and handle removed
from mInputs.
ReleaseInput, startInput are called when record track is
invalidated and restored back as part of closing the input.
This would also cause setCapturestate to never be false.

Change-Id: I9f1c4f82b84805b5f7a0aa770b333e7f2aeee21c

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index a638c1d..97a09ca 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1816,6 +1816,32 @@
     return status;
 }
 
+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);
+        ssize_t patch_index = mAudioPatches.indexOfKey(inputDesc->mPatchHandle);
+        if (patch_index >= 0) {
+            sp<AudioPatch> patchDesc = mAudioPatches.valueAt(patch_index);
+            status_t status = mpClientInterface->releaseAudioPatch(patchDesc->mAfPatchHandle, 0);
+            mAudioPatches.removeItemsAt(patch_index);
+            patchRemoved = true;
+        }
+        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));
+        }
+    }
+    nextAudioPortGeneration();
+
+    if (patchRemoved) {
+        mpClientInterface->onAudioPatchListUpdate();
+    }
+}
+
 AudioPolicyManagerCustom::AudioPolicyManagerCustom(AudioPolicyClientInterface *clientInterface)
     : AudioPolicyManager(clientInterface),
       mHdmiAudioDisabled(false),

policy_hal/AudioPolicyManager.h

diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h
index 53c9a1b..8e47d19 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -73,6 +73,7 @@
         // indicates to the audio policy manager that the input stops being used.
         virtual status_t stopInput(audio_io_handle_t input,
                                    audio_session_t session);
+        virtual void closeAllInputs();
 
 protected: