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

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

Merge "Add flag for ContextParams setShouldRegisterAttributionSource" into main

parents 779139dd 4f8350d0

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10571,7 +10571,7 @@ package android.content { 
  public final class ContextParams {

    method @Nullable public String getAttributionTag();

    method @Nullable public android.content.AttributionSource getNextAttributionSource();

    method @NonNull public boolean shouldRegisterAttributionSource();

    method @FlaggedApi("android.permission.flags.should_register_attribution_source") @NonNull public boolean shouldRegisterAttributionSource();

  }















  public static final class ContextParams.Builder {









@@ -10580,7 +10580,7 @@ package android.content {













    method @NonNull public android.content.ContextParams build();















    method @NonNull public android.content.ContextParams.Builder setAttributionTag(@Nullable String);















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













    method @NonNull public android.content.ContextParams.Builder setShouldRegisterAttributionSource(boolean);













    method @FlaggedApi("android.permission.flags.should_register_attribution_source") @NonNull public android.content.ContextParams.Builder setShouldRegisterAttributionSource(boolean);















  }





























  public class ContextWrapper extends android.content.Context {

























core/java/android/content/ContextParams.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -16,7 +16,10 @@





























package android.content;





























import static android.permission.flags.Flags.FLAG_SHOULD_REGISTER_ATTRIBUTION_SOURCE;





























import android.Manifest;













import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.RequiresPermission;










@@ -102,6 +105,7 @@ public final class ContextParams {













     * registered.















     */















    @NonNull













    @FlaggedApi(FLAG_SHOULD_REGISTER_ATTRIBUTION_SOURCE)















    public boolean shouldRegisterAttributionSource() {















        return mShouldRegisterAttributionSource;















    }










@@ -179,6 +183,7 @@ public final class ContextParams {













         *                       created should be registered.















         */















        @NonNull













        @FlaggedApi(FLAG_SHOULD_REGISTER_ATTRIBUTION_SOURCE)















        public Builder setShouldRegisterAttributionSource(boolean shouldRegister) {















            mShouldRegisterAttributionSource = shouldRegister;















            return this;

































core/java/android/permission/flags.aconfig



+7
−0




























Original line number
Diff line number
Diff line








@@ -28,3 +28,10 @@ flag {













  description: "enable AttributionSource.setNextAttributionSource"















  bug: "304478648"















}



























flag {













    name: "should_register_attribution_source"













    namespace: "permissions"













    description: "enable the shouldRegisterAttributionSource API"













    bug: "305057691"













}