commit b5dc2d1e3653d9f268a35bf8176a003217b38b6c
author Eric Laurent <elaurent@google.com> Sat Jul 13 09:32:47 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 18 04:10:01 2019 +0000
tree fe812669d009ddb4c7148d791a65a4961b9c533c
parent 7879fa986aba0570276adf4d1554d4813e85ec12

audio policy: fix mmap capture disconnect

Force close mmap input streams when a capture device is
connected to force disconnect callback to client.

Bug: 137311579
Test: capture with oboetester and connect headset
Change-Id: Iafe939247fa565e2424b40afacdb79a31b8955b7
(cherry picked from commit 7bd2939d6ce0574f01771b8569b1d76faf2b09b7)
(cherry picked from commit c833ccc86b8af68cfb80de182309be6d4eaac860)

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index a6730fc..1d4dacd 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2396,7 +2396,8 @@
     for (size_t i = 0; i < mInputs.size(); i++) {
         const sp<AudioInputDescriptor> input = mInputs.valueAt(i);
         if (input->clientsList().size() == 0
-                || !mAvailableInputDevices.containsAtLeastOne(input->supportedDevices())) {
+                || !mAvailableInputDevices.containsAtLeastOne(input->supportedDevices())
+                || (input->getAudioPort()->getFlags() & AUDIO_INPUT_FLAG_MMAP_NOIRQ) != 0) {
             inputsToClose.push_back(mInputs.keyAt(i));
         } else {
             bool close = false;