commit 078b6a44e4bcd8e91a9935d93e25166e27552c74
author Nate Myren <ntmyren@google.com> Thu Nov 10 14:09:34 2022 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 14 02:24:00 2022 +0000
tree 7315f0907f9e45fda46e6a8c722c184419e2833d
parent 00b6f6cca7801af8e4922449c7a377580c3eb389

RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities

Bug: 258672042
Test: manual
Change-Id: I44243bbbd68db9ee8b5c4ba02a061e14bd300d20
(cherry picked from commit ca6e2770753c5d61185552140abd613367b79365)
Merged-In: I44243bbbd68db9ee8b5c4ba02a061e14bd300d20

media/utils/ServiceUtilities.cpp

diff --git a/media/utils/ServiceUtilities.cpp b/media/utils/ServiceUtilities.cpp
index 07f4529..83b84e3 100644
--- a/media/utils/ServiceUtilities.cpp
+++ b/media/utils/ServiceUtilities.cpp
@@ -103,11 +103,10 @@
     AttributionSourceState myAttributionSource;
     myAttributionSource.uid = VALUE_OR_FATAL(android::legacy2aidl_uid_t_int32_t(getuid()));
     myAttributionSource.pid = VALUE_OR_FATAL(android::legacy2aidl_pid_t_int32_t(getpid()));
-    if (callerAttributionSource.token != nullptr) {
-        myAttributionSource.token = callerAttributionSource.token;
-    } else {
-        myAttributionSource.token = sp<BBinder>::make();
-    }
+    // Create a static token for audioserver requests, which identifies the
+    // audioserver to the app ops system
+    static sp<BBinder> appOpsToken = sp<BBinder>::make();
+    myAttributionSource.token = appOpsToken;
     myAttributionSource.next.push_back(nextAttributionSource);
 
     return std::optional<AttributionSourceState>{myAttributionSource};