commit 451014cd94b6b5e859bfbf70d2b35275780d1bd2
author Linux Build Service Account <lnxbuild@localhost> Sun Apr 29 08:44:07 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Apr 29 08:44:07 2018 -0700
tree d5066690bac6cc0425d9d914105608ce10835061
parent afe48b09b06d4a3c0fc48eef4007812d2bdd7d2f
parent f31e3691c36541f87da8d4024aa208ee028d96b9

Merge "policy_hal: Remove closeAllInputs() from custom policy manager"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 898e4f7..298aed4 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -2273,30 +2273,6 @@
     return status;
 }
 
-void AudioPolicyManagerCustom::closeAllInputs() {
-    bool patchRemoved = false;
-
-    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->getPatchHandle());
-        if (patch_index >= 0) {
-            sp<AudioPatch> patchDesc = mAudioPatches.valueAt(patch_index);
-            (void) /*status_t status*/ mpClientInterface->releaseAudioPatch(patchDesc->mAfPatchHandle, 0);
-            mAudioPatches.removeItemsAt(patch_index);
-            patchRemoved = true;
-        }
-        mpClientInterface->closeInput(mInputs.keyAt(input_index-1));
-        inputDesc->close();
-    }
-    mInputs.clear();
-    SoundTrigger::setCaptureState(false);
-    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 17101b0..ce3da2f 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -114,8 +114,6 @@
         virtual status_t stopInput(audio_io_handle_t input,
                                    audio_session_t session);
 
-        virtual void closeAllInputs();
-
 protected:
 
          status_t checkAndSetVolume(audio_stream_type_t stream,