commit e9023dac008f3d53f3009668cb5e266e81c0a655
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Nov 18 22:34:54 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Nov 18 22:34:54 2022 +0000
tree dda38b6add65356bfdc59b22f4710710ad6e3c4b
parent e3117dfbcf19c328e98cede3a4598402d1f0275f
parent 9a213a1ef475d828d02d0055e2b713cf2068c683

[automerge] RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities 2p: 9a213a1ef4

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

Bug: 258672042
Change-Id: I261829c44fae41089b7e95b87a2ecd001b0eff3f

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};