Merge "Rename device aware permissions apis flag" into main (9d7b3fba) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -4468,7 +4468,7 @@ package android.app {
		method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu, int);
		method public android.net.Uri onProvideReferrer();
		method public void onRequestPermissionsResult(int, @NonNull String[], @NonNull int[]);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") public void onRequestPermissionsResult(int, @NonNull String[], @NonNull int[], int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public void onRequestPermissionsResult(int, @NonNull String[], @NonNull int[], int);
		method @CallSuper protected void onRestart();
		method protected void onRestoreInstanceState(@NonNull android.os.Bundle);
		method public void onRestoreInstanceState(@Nullable android.os.Bundle, @Nullable android.os.PersistableBundle);
		@@ -4510,7 +4510,7 @@ package android.app {
		method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);
		method public void requestFullscreenMode(int, @Nullable android.os.OutcomeReceiver<java.lang.Void,java.lang.Throwable>);
		method public final void requestPermissions(@NonNull String[], int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") public final void requestPermissions(@NonNull String[], int, int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public final void requestPermissions(@NonNull String[], int, int);
		method public final void requestShowKeyboardShortcuts();
		method @Deprecated public boolean requestVisibleBehind(boolean);
		method public final boolean requestWindowFeature(int);
		@@ -4558,7 +4558,7 @@ package android.app {
		method public void setVrModeEnabled(boolean, @NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public boolean shouldDockBigOverlays();
		method public boolean shouldShowRequestPermissionRationale(@NonNull String);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") public boolean shouldShowRequestPermissionRationale(@NonNull String, int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public boolean shouldShowRequestPermissionRationale(@NonNull String, int);
		method public boolean shouldUpRecreateTask(android.content.Intent);
		method public boolean showAssist(android.os.Bundle);
		method @Deprecated public final void showDialog(int);
		@@ -9839,7 +9839,7 @@ package android.content {
		method public int describeContents();
		method public void enforceCallingUid();
		method @Nullable public String getAttributionTag();
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") public int getDeviceId();
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public int getDeviceId();
		method @Nullable public android.content.AttributionSource getNext();
		method @Nullable public String getPackageName();
		method public int getPid();
		@@ -9855,7 +9855,7 @@ package android.content {
		ctor public AttributionSource.Builder(@NonNull android.content.AttributionSource);
		method @NonNull public android.content.AttributionSource build();
		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 @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") @NonNull public android.content.AttributionSource.Builder setDeviceId(int);
		method @NonNull public android.content.AttributionSource.Builder setNext(@Nullable 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);

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -4009,7 +4009,7 @@ package android.content.pm {
		field public static final int DELETE_FAILED_OWNER_BLOCKED = -4; // 0xfffffffc
		field public static final int DELETE_KEEP_DATA = 1; // 0x1
		field public static final int DELETE_SUCCEEDED = 1; // 0x1
		field @FlaggedApi("android.permission.flags.device_aware_permission_apis") public static final String EXTRA_REQUEST_PERMISSIONS_DEVICE_ID = "android.content.pm.extra.REQUEST_PERMISSIONS_DEVICE_ID";
		field @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public static final String EXTRA_REQUEST_PERMISSIONS_DEVICE_ID = "android.content.pm.extra.REQUEST_PERMISSIONS_DEVICE_ID";
		field public static final String EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES";
		field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";
		field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";
		@@ -4115,7 +4115,7 @@ package android.content.pm {

		public static interface PackageManager.OnPermissionsChangedListener {
		method public void onPermissionsChanged(int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") public default void onPermissionsChanged(int, @NonNull String);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public default void onPermissionsChanged(int, @NonNull String);
		}

		public static final class PackageManager.UninstallCompleteCallback implements android.os.Parcelable {
		@@ -10927,13 +10927,13 @@ package android.permission {
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_APP_HIBERNATION) public void onGetUnusedAppCount(@NonNull java.util.function.IntConsumer);
		method @BinderThread public abstract void onGrantOrUpgradeDefaultRuntimePermissions(@NonNull Runnable);
		method @Deprecated @BinderThread public void onOneTimePermissionSessionTimeout(@NonNull String);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") @BinderThread public void onOneTimePermissionSessionTimeout(@NonNull String, int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") @BinderThread public void onOneTimePermissionSessionTimeout(@NonNull String, int);
		method @Deprecated @BinderThread public void onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @Deprecated @BinderThread public void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);
		method @BinderThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String, @NonNull Runnable);
		method @BinderThread public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>);
		method @Deprecated @BinderThread public void onRevokeSelfPermissionsOnKill(@NonNull String, @NonNull java.util.List<java.lang.String>, @NonNull Runnable);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") @BinderThread public void onRevokeSelfPermissionsOnKill(@NonNull String, @NonNull java.util.List<java.lang.String>, int, @NonNull Runnable);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") @BinderThread public void onRevokeSelfPermissionsOnKill(@NonNull String, @NonNull java.util.List<java.lang.String>, int, @NonNull Runnable);
		method @Deprecated @BinderThread public abstract void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @BinderThread public void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull android.permission.AdminPermissionControlParams, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @BinderThread public void onStageAndApplyRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -903,7 +903,7 @@ package android.content {
		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") public AttributionSource(int, int, @Nullable String, @Nullable String, @NonNull android.os.IBinder, @Nullable String[], int, @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/app/Activity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -5572,7 +5572,7 @@ public class Activity extends ContextThemeWrapper
		* @see #shouldShowRequestPermissionRationale
		* @see Context#DEVICE_ID_DEFAULT
		*/
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		public final void requestPermissions(@NonNull String[] permissions, int requestCode,
		int deviceId) {
		if (requestCode < 0) {
		@@ -5645,7 +5645,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @see #requestPermissions
		*/
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
		@NonNull int[] grantResults, int deviceId) {
		onRequestPermissionsResult(requestCode, permissions, grantResults);
		@@ -5678,7 +5678,7 @@ public class Activity extends ContextThemeWrapper
		* @see #requestPermissions
		* @see #onRequestPermissionsResult
		*/
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		public boolean shouldShowRequestPermissionRationale(@NonNull String permission, int deviceId) {
		final PackageManager packageManager = getDeviceId() == deviceId ? getPackageManager()
		: createDeviceContext(deviceId).getPackageManager();

core/java/android/content/AttributionSource.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ public final class AttributionSource implements Parcelable {

		/** @hide */
		@TestApi
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		public AttributionSource(int uid, int pid, @Nullable String packageName,
		@Nullable String attributionTag, @NonNull IBinder token,
		@Nullable String[] renouncedPermissions,
		@@ -539,7 +539,7 @@ public final class AttributionSource implements Parcelable {
		* <p>
		* This device ID is used for permissions checking during attribution source validation.
		*/
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		public int getDeviceId() {
		return mAttributionSourceState.deviceId;
		}
		@@ -727,7 +727,7 @@ public final class AttributionSource implements Parcelable {
		*
		* @return the builder
		*/
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		public @NonNull Builder setDeviceId(int deviceId) {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x12;