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

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

Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev 

* changes:
  [automerge] RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities 2p: 9a213a1e
  RESTRICT AUTOMERGE Use static token for myAttributionSource in ServiceUtilities
parents 5a884e06 e9023dac

media/utils/ServiceUtilities.cpp

+4 −1
Original line number Diff line number Diff line
@@ -101,7 +101,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()));

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