commit 160ddb098c81be8d8b5160612b9c1cfba8d55764
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 25 18:41:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 25 18:41:17 2019 +0000
tree 35d6325326ee20746a9940bc98249bf583c83f83
parent 32ebca3611c530fc0f36225dcb1ca2ec50e8d9f1
parent 74300e0e5b195d235838c2996500e746a37f4914

Merge "media.extractor pass client uid for attribution"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index e8e9fa6..c971299 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4828,6 +4828,7 @@
         ALOGW("closeOutput() unknown output %d", output);
         return;
     }
+    const bool closingOutputWasActive = closingOutput->isActive();
     mPolicyMixes.closeOutput(closingOutput);
 
     // look for duplicated outputs connected to the output being removed.
@@ -4867,6 +4868,9 @@
         mpClientInterface->onAudioPatchListUpdate();
     }
 
+    if (closingOutputWasActive) {
+        closingOutput->stop();
+    }
     closingOutput->close();
 
     removeOutput(output);