Merge "Deprecate permission tree APIs" into main (3758c29c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -13225,8 +13225,8 @@ package android.content.pm {
		public abstract class PackageManager {
		ctor @Deprecated public PackageManager();
		method @Deprecated public abstract void addPackageToPreferred(@NonNull String);
		method public abstract boolean addPermission(@NonNull android.content.pm.PermissionInfo);
		method public abstract boolean addPermissionAsync(@NonNull android.content.pm.PermissionInfo);
		method @Deprecated @FlaggedApi("android.permission.flags.permission_tree_apis_deprecated") public abstract boolean addPermission(@NonNull android.content.pm.PermissionInfo);
		method @Deprecated @FlaggedApi("android.permission.flags.permission_tree_apis_deprecated") public abstract boolean addPermissionAsync(@NonNull android.content.pm.PermissionInfo);
		method @Deprecated public abstract void addPreferredActivity(@NonNull android.content.IntentFilter, int, @Nullable android.content.ComponentName[], @NonNull android.content.ComponentName);
		method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean addWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int);
		method public boolean canPackageQuery(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
		@@ -13367,7 +13367,7 @@ package android.content.pm {
		method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryServiceProperty(@NonNull String);
		method public void relinquishUpdateOwnership(@NonNull String);
		method @Deprecated public abstract void removePackageFromPreferred(@NonNull String);
		method public abstract void removePermission(@NonNull String);
		method @Deprecated @FlaggedApi("android.permission.flags.permission_tree_apis_deprecated") public abstract void removePermission(@NonNull String);
		method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean removeWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int);
		method public void requestChecksums(@NonNull String, boolean, int, @NonNull java.util.List<java.security.cert.Certificate>, @NonNull android.content.pm.PackageManager.OnChecksumsReadyListener) throws java.security.cert.CertificateEncodingException, android.content.pm.PackageManager.NameNotFoundException;
		method @Nullable public abstract android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, int);

core/java/android/content/pm/PackageManager.java

+24 −3

Original line number	Diff line number	Diff line
		@@ -6729,6 +6729,11 @@ public abstract class PackageManager {
		* If the given permission already exists, the info you supply here
		* will be used to update it.
		*
		* @deprecated Support for dynamic permissions is going to be removed, and apps that use dynamic
		* permissions should declare their permissions statically inside their app manifest instead.
		* This method will become a no-op in a future Android release and eventually be removed from
		* the SDK.
		*
		* @param info Description of the permission to be added.
		*
		* @return Returns true if a new permission was created, false if an
		@@ -6739,7 +6744,9 @@ public abstract class PackageManager {
		*
		* @see #removePermission(String)
		*/
		//@Deprecated
		@SuppressWarnings("HiddenAbstractMethod")
		@FlaggedApi(android.permission.flags.Flags.FLAG_PERMISSION_TREE_APIS_DEPRECATED)
		@Deprecated
		public abstract boolean addPermission(@NonNull PermissionInfo info);

		/**
		@@ -6748,8 +6755,15 @@ public abstract class PackageManager {
		* allowing it to return quicker and batch a series of adds at the
		* expense of no guarantee the added permission will be retained if
		* the device is rebooted before it is written.
		*
		* @deprecated Support for dynamic permissions is going to be removed, and apps that use dynamic
		* permissions should declare their permissions statically inside their app manifest instead.
		* This method will become a no-op in a future Android release and eventually be removed from
		* the SDK.
		*/
		//@Deprecated
		@SuppressWarnings("HiddenAbstractMethod")
		@FlaggedApi(android.permission.flags.Flags.FLAG_PERMISSION_TREE_APIS_DEPRECATED)
		@Deprecated
		public abstract boolean addPermissionAsync(@NonNull PermissionInfo info);

		/**
		@@ -6758,6 +6772,11 @@ public abstract class PackageManager {
		* -- you are only allowed to remove permissions that you are allowed
		* to add.
		*
		* @deprecated Support for dynamic permissions is going to be removed, and apps that use dynamic
		* permissions should declare their permissions statically inside their app manifest instead.
		* This method will become a no-op in a future Android release and eventually be removed from
		* the SDK.
		*
		* @param permName The name of the permission to remove.
		*
		* @throws SecurityException if you are not allowed to remove the
		@@ -6765,7 +6784,9 @@ public abstract class PackageManager {
		*
		* @see #addPermission(PermissionInfo)
		*/
		//@Deprecated
		@SuppressWarnings("HiddenAbstractMethod")
		@FlaggedApi(android.permission.flags.Flags.FLAG_PERMISSION_TREE_APIS_DEPRECATED)
		@Deprecated
		public abstract void removePermission(@NonNull String permName);

		/**