commit cee606de904204e96447ae9010ab40bb151bf3bf
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 18 04:11:27 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 18 04:11:27 2019 +0000
tree fe812669d009ddb4c7148d791a65a4961b9c533c
parent 7879fa986aba0570276adf4d1554d4813e85ec12
parent b5dc2d1e3653d9f268a35bf8176a003217b38b6c

Merge cherrypicks of [8681848, 8682094, 8682365, 8682497, 8682498, 8682518, 8682519, 8681849, 8681887, 8681888, 8682539, 8682540, 8682541, 8681283, 8682521] into qt-release

Change-Id: Ic6e5a0ed8a340bb3d3b13e353acf5edbebea8306

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;