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

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

Merge "Add trunk stable flag for exposed AttributionSource constructor" into main

parents e32276f8 03371d5f

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ package android.content { 
    ctor public AttributionSource(int, @Nullable String, @Nullable String);

    ctor public AttributionSource(int, @Nullable String, @Nullable String, @NonNull android.os.IBinder);

    ctor public AttributionSource(int, @Nullable String, @Nullable String, @Nullable java.util.Set<java.lang.String>, @Nullable android.content.AttributionSource);

    ctor public AttributionSource(int, int, @Nullable String, @Nullable String, @NonNull android.os.IBinder, @Nullable String[], @Nullable android.content.AttributionSource);

    ctor @FlaggedApi("android.permission.flags.attribution_source_constructor") public AttributionSource(int, int, @Nullable String, @Nullable String, @NonNull android.os.IBinder, @Nullable String[], @Nullable android.content.AttributionSource);

    ctor @FlaggedApi("android.permission.flags.device_aware_permission_apis") public AttributionSource(int, int, @Nullable String, @Nullable String, @NonNull android.os.IBinder, @Nullable String[], int, @Nullable android.content.AttributionSource);

    method public void enforceCallingPid();

  }

core/java/android/content/AttributionSource.java

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


    /** @hide */

    @TestApi

    @FlaggedApi(Flags.FLAG_ATTRIBUTION_SOURCE_CONSTRUCTOR)

    public AttributionSource(int uid, int pid, @Nullable String packageName,

            @Nullable String attributionTag, @NonNull IBinder token,

            @Nullable String[] renouncedPermissions,

core/java/android/permission/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -35,3 +35,10 @@ flag { 
    description: "enable the shouldRegisterAttributionSource API"

    bug: "305057691"

}



flag {

  name: "attribution_source_constructor"

  namespace: "permissions"

  description: "enable AttributionSource(int, int, String, String, IBinder, String[], AttributionSource)"

  bug: "304478648"

}
 
 No newline at end of file