commit d382424803db15a142755af210a5d0b458df66ca
author Nadav Bar <nadavbar@google.com> Thu Mar 05 12:32:50 2020 +0000
committer Nadav Bar <nadavbar@google.com> Thu Mar 05 12:32:56 2020 +0000
tree 6e5e312908a04347a826b4ae74ce843fac524c49
parent cc375985eea84dce28ba693750b845b4c60167ba
parent bddb75c03b7494a7148498a06e72a90fc8198132

resolve merge conflicts of bddb75c03b7494a7148498a06e72a90fc8198132 to qt-qpr1-dev-plus-aosp

Change-Id: I8c694d9ed1d4b4e74efd8aa643d74adb5033a3db

media/libaudioclient/IAudioPolicyService.cpp

diff --git a/media/libaudioclient/IAudioPolicyService.cpp b/media/libaudioclient/IAudioPolicyService.cpp
index 0facaf8..52eb9a4 100644
--- a/media/libaudioclient/IAudioPolicyService.cpp
+++ b/media/libaudioclient/IAudioPolicyService.cpp
@@ -1401,7 +1401,8 @@
         case SET_RTT_ENABLED:
         case SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
         case REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
-        case GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY: {
+        case GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
+        case SET_ALLOWED_CAPTURE_POLICY: {
             if (!isServiceUid(IPCThreadState::self()->getCallingUid())) {
                 ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",
                       __func__, code, IPCThreadState::self()->getCallingPid(),