Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 484a72d7 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities am: ca6e2770 

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



Change-Id: I691c992467ecf519964ee65a9a0e5e085d89bc68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d97e9f22 ca6e2770

media/utils/ServiceUtilities.cpp

+4 −5
Original line number Diff line number Diff line
@@ -103,11 +103,10 @@ std::optional<AttributionSourceState> resolveAttributionSource( 
    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};