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

Commit e7e99abe authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "Add new flag for AttributionSource.setNextAttributionSource" into main

parents 170208c1 ba0b83c9

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9788,7 +9788,7 @@ package android.content { 
    method @NonNull public android.content.AttributionSource.Builder setAttributionTag(@Nullable String);

    method @FlaggedApi("android.permission.flags.device_aware_permission_apis") @NonNull public android.content.AttributionSource.Builder setDeviceId(int);

    method @Deprecated @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);

    method @NonNull public android.content.AttributionSource.Builder setNextAttributionSource(@NonNull android.content.AttributionSource);

    method @FlaggedApi("android.permission.flags.set_next_attribution_source") @NonNull public android.content.AttributionSource.Builder setNextAttributionSource(@NonNull android.content.AttributionSource);

    method @NonNull public android.content.AttributionSource.Builder setPackageName(@Nullable String);

    method @NonNull public android.content.AttributionSource.Builder setPid(int);

  }

core/java/android/content/AttributionSource.java

+1 −0
Original line number Diff line number Diff line
@@ -744,6 +744,7 @@ public final class AttributionSource implements Parcelable { 
        /**

         * The next app to receive the permission protected data.

         */

        @FlaggedApi(Flags.FLAG_SET_NEXT_ATTRIBUTION_SOURCE)

        public @NonNull Builder setNextAttributionSource(@NonNull AttributionSource value) {

            checkNotUsed();

            mBuilderFieldsSet |= 0x20;

core/java/android/permission/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -21,3 +21,10 @@ flag { 
    description: "enable role controller in system server"

    bug: "302562590"

}



flag {

  name: "set_next_attribution_source"

  namespace: "permissions"

  description: "enable AttributionSource.setNextAttributionSource"

  bug: "304478648"

}