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

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

Merge "Remove unused AttributionSource constructor and its flag." into main

parents 27859c82 f1e1d2cf

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -966,7 +966,6 @@ 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 @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_enabled") 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

+0 −11
Original line number Diff line number Diff line
@@ -160,17 +160,6 @@ public final class AttributionSource implements Parcelable { 
                next);

    }



    /** @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,

            @Nullable AttributionSource next) {

        this(uid, pid, packageName, attributionTag, token, renouncedPermissions,

                Context.DEVICE_ID_DEFAULT, next);

    }



    /** @hide */

    @TestApi

    @FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)

core/java/android/permission/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ flag { 
    bug: "305057691"

}



flag {

  name: "attribution_source_constructor"

  is_exported: true

  namespace: "permissions"

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

  bug: "304478648"

}



flag {

    name: "enhanced_confirmation_mode_apis_enabled"

    is_exported: true