diff options
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/AttributionSource.java | 11 | ||||
| -rw-r--r-- | core/java/android/permission/flags.aconfig | 8 |
3 files changed, 0 insertions, 20 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 2437be836086..e225c5b03f8b 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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(); } diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java index af1301140358..4aa398b3ab57 100644 --- a/core/java/android/content/AttributionSource.java +++ b/core/java/android/content/AttributionSource.java @@ -162,17 +162,6 @@ 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, - @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) public AttributionSource(int uid, int pid, @Nullable String packageName, @Nullable String attributionTag, @NonNull IBinder token, diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index b58830861c5e..0e285601b76f 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -44,14 +44,6 @@ flag { } 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 is_fixed_read_only: true |