commit 2dbb1a997a0b8db2c007e3c4042f0da17d21ba33
author Jean-Michel Trivi <jmtrivi@google.com> Fri Nov 01 22:46:25 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 01 22:46:37 2024 +0000
tree 8292eace5aabb5d7f957d74e3f92da38c848777c
parent 611efd59d30061807b0b1c7ac1a7ac800d9d35ee

Revert^2 "audiopolicy: speaker cleanup AudioAttributes usage"

611efd59d30061807b0b1c7ac1a7ac800d9d35ee

Change-Id: I7abdcb5f5d82b558cac07114f2c202f7bd32f25c

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 1ffa176..0d9427a 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -425,6 +425,17 @@
         }
     }
 
+    //TODO this permission check should extend to all system usages
+    if (attr.usage == AUDIO_USAGE_SPEAKER_CLEANUP) {
+        if (!(audioserver_permissions() ?
+              CHECK_PERM(MODIFY_AUDIO_ROUTING, attributionSource.uid)
+              : modifyAudioRoutingAllowed())) {
+            ALOGE("%s: permission denied: SPEAKER_CLEANUP not allowed for uid %d pid %d",
+                    __func__, attributionSource.uid, attributionSource.pid);
+            return binderStatusFromStatusT(PERMISSION_DENIED);
+        }
+    }
+
     AutoCallerClear acc;
     AudioPolicyInterface::output_type_t outputType;
     bool isSpatialized = false;