commit 702397882b9cd9fed00634cb9faeb5054b5efca0
author Nate Myren <ntmyren@google.com> Thu Nov 10 14:09:34 2022 -0800
committer Nate Myren <ntmyren@google.com> Tue Nov 29 22:31:38 2022 +0000
tree 436129d53f9d2e89dbc46f8ae5953e59ed5487c3
parent 17aac56edd2884a1f25af9462b45c3a1b5bddaf3

RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities

Bug: 258672042
Test: manual
Change-Id: I44243bbbd68db9ee8b5c4ba02a061e14bd300d20

media/utils/ServiceUtilities.cpp

diff --git a/media/utils/ServiceUtilities.cpp b/media/utils/ServiceUtilities.cpp
index 9c7b863..04e280a 100644
--- a/media/utils/ServiceUtilities.cpp
+++ b/media/utils/ServiceUtilities.cpp
@@ -101,7 +101,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()));
-    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};