commit d80c34a3eefb82bef194e47d68e7a2bc4e244fae
author Eric Laurent <elaurent@google.com> Fri Nov 05 14:31:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 05 14:31:39 2021 +0000
tree cc5c412a95fa38bdf9f4e47362b97f2680c3c7c1
parent 8f2ebce1adbb03dccf7b783f5f97c03716c02ecd
parent c8fbfd498de5ecb9d361d8ac8dd59cb295167d61

Merge "Binder count in audioserver will increase more and more when recording."

media/utils/ServiceUtilities.cpp

diff --git a/media/utils/ServiceUtilities.cpp b/media/utils/ServiceUtilities.cpp
index 9c7b863..42f48a5 100644
--- a/media/utils/ServiceUtilities.cpp
+++ b/media/utils/ServiceUtilities.cpp
@@ -101,7 +101,11 @@
     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();
+    if (callerAttributionSource.token != nullptr) {
+        myAttributionSource.token = callerAttributionSource.token;
+    } else {
+        myAttributionSource.token = sp<BBinder>::make();
+    }
     myAttributionSource.next.push_back(nextAttributionSource);
 
     return std::optional<AttributionSourceState>{myAttributionSource};