commit 0d144c8163b0745ff96be2e2f1908e3bbd8f6103
author Eric Laurent <elaurent@google.com> Wed Jul 01 00:11:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 01 00:11:15 2020 +0000
tree 8e12612ceb80c0f509acb941304049838b93d065
parent 0ca25a578e28bfa7fc4d4e4504a1eb777586887e
parent 872274c05f70ca893b01bd0abf87968c554e34de

Merge "audio policy: remove capture restrictions for IN_COMMUNICATION mode" into rvc-dev am: cdde799ce5 am: 3b2563bde8 am: 872274c05f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12048628

Change-Id: Ic6b3686063e7691aaf72ebc6e4d514d095ba540f

services/audiopolicy/service/AudioPolicyService.cpp

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 9b61e74..e847f9f 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -566,11 +566,13 @@
 
         auto canCaptureIfInCallOrCommunication = [&](const auto &recordClient) REQUIRES(mLock) {
             bool canCaptureCall = recordClient->canCaptureOutput;
-            bool canCaptureCommunication = recordClient->canCaptureOutput
-                || recordClient->uid == mPhoneStateOwnerUid
-                || isServiceUid(mPhoneStateOwnerUid);
-            return !(isInCall && !canCaptureCall)
-                && !(isInCommunication && !canCaptureCommunication);
+            return !(isInCall && !canCaptureCall);
+//TODO(b/160260850): restore restriction to mode owner once fix for misbehaving apps is merged
+//            bool canCaptureCommunication = recordClient->canCaptureOutput
+//                || recordClient->uid == mPhoneStateOwnerUid
+//                || isServiceUid(mPhoneStateOwnerUid);
+//            return !(isInCall && !canCaptureCall)
+//                && !(isInCommunication && !canCaptureCommunication);
         };
 
         // By default allow capture if: