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

Commit e45fb832 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities" into tm-dev

parents 50639ca3 ca6e2770
Loading
Loading
Loading
Loading
+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};