From 8bda34c493d6206f772476b233ab40224cab44c1 Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Thu, 20 May 2021 16:14:03 -0700 Subject: [PATCH] Expose platform permission group mapping as public API. The API is moved from PermissionControllerManager (only a System API) to PackageManager to expose it as public API. Bug: 182094776 Test: atest GetPermissionGroupInfoTest Change-Id: I175afb2e37bf2651b91765029645f7940f58f39c --- core/api/current.txt | 2 ++ core/api/system-current.txt | 3 -- .../app/ApplicationPackageManager.java | 23 +++++++++++++++ .../android/content/pm/PackageManager.java | 29 +++++++++++++++++++ .../PermissionControllerManager.java | 10 +++---- core/res/AndroidManifest.xml | 5 ---- 6 files changed, 58 insertions(+), 14 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index a3d71f176706f..a1f60cc6aa719 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12535,6 +12535,7 @@ package android.content.pm { method public abstract int getComponentEnabledSetting(@NonNull android.content.ComponentName); method @NonNull public abstract android.graphics.drawable.Drawable getDefaultActivityIcon(); method @Nullable public abstract android.graphics.drawable.Drawable getDrawable(@NonNull String, @DrawableRes int, @Nullable android.content.pm.ApplicationInfo); + method public void getGroupOfPlatformPermission(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @NonNull public android.content.pm.InstallSourceInfo getInstallSourceInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract java.util.List getInstalledApplications(int); method @NonNull public java.util.List getInstalledModules(int); @@ -12559,6 +12560,7 @@ package android.content.pm { method @NonNull public abstract java.util.List getPackagesHoldingPermissions(@NonNull String[], int); method @NonNull public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method public abstract android.content.pm.PermissionInfo getPermissionInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public void getPlatformPermissionsForGroup(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer>); method @Deprecated public abstract int getPreferredActivities(@NonNull java.util.List, @NonNull java.util.List, @Nullable String); method @Deprecated @NonNull public abstract java.util.List getPreferredPackages(int); method @NonNull public android.content.pm.PackageManager.Property getProperty(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a97a257eaabe4..7160e47be9b90 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -106,7 +106,6 @@ package android { field public static final String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS"; field public static final String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"; field public static final String GET_RUNTIME_PERMISSIONS = "android.permission.GET_RUNTIME_PERMISSIONS"; - field public static final String GET_RUNTIME_PERMISSION_GROUP_MAPPING = "android.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING"; field public static final String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO"; field @Deprecated public static final String GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS = "android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"; field public static final String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS"; @@ -8845,8 +8844,6 @@ package android.permission { public final class PermissionControllerManager { method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.RESTORE_RUNTIME_PERMISSIONS}) public void applyStagedRuntimePermissionBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING) public void getGroupOfPlatformPermission(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING) public void getPlatformPermissionsForGroup(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer>); method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public void getRuntimePermissionBackup(@NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermissions(@NonNull java.util.Map>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback); method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.RESTORE_RUNTIME_PERMISSIONS}) public void stageAndApplyRuntimePermissionsBackup(@NonNull byte[], @NonNull android.os.UserHandle); diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 5a70f925fc02f..cd2c12cb4b6f2 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -24,6 +24,7 @@ import static android.content.pm.Checksum.TYPE_WHOLE_SHA1; import static android.content.pm.Checksum.TYPE_WHOLE_SHA256; import static android.content.pm.Checksum.TYPE_WHOLE_SHA512; +import android.annotation.CallbackExecutor; import android.annotation.DrawableRes; import android.annotation.NonNull; import android.annotation.Nullable; @@ -103,6 +104,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; +import android.permission.PermissionControllerManager; import android.permission.PermissionManager; import android.provider.Settings; import android.system.ErrnoException; @@ -137,6 +139,8 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; +import java.util.concurrent.Executor; +import java.util.function.Consumer; /** @hide */ public class ApplicationPackageManager extends PackageManager { @@ -400,6 +404,25 @@ public class ApplicationPackageManager extends PackageManager { return permissionInfos; } + @Override + public void getPlatformPermissionsForGroup(@NonNull String permissionGroupName, + @NonNull @CallbackExecutor Executor executor, + @NonNull Consumer> callback) { + final PermissionControllerManager permissionControllerManager = mContext.getSystemService( + PermissionControllerManager.class); + permissionControllerManager.getPlatformPermissionsForGroup(permissionGroupName, executor, + callback); + } + + @Override + public void getGroupOfPlatformPermission(@NonNull String permissionName, + @NonNull @CallbackExecutor Executor executor, @NonNull Consumer callback) { + final PermissionControllerManager permissionControllerManager = mContext.getSystemService( + PermissionControllerManager.class); + permissionControllerManager.getGroupOfPlatformPermission(permissionName, executor, + callback); + } + @Override public boolean arePermissionsIndividuallyControlled() { return mContext.getResources().getBoolean( diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index edf0e57534412..33606e8552206 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -17,6 +17,7 @@ package android.content.pm; import android.Manifest; +import android.annotation.CallbackExecutor; import android.annotation.CheckResult; import android.annotation.DrawableRes; import android.annotation.IntDef; @@ -95,6 +96,8 @@ import java.util.Locale; import java.util.Objects; import java.util.Set; import java.util.UUID; +import java.util.concurrent.Executor; +import java.util.function.Consumer; /** * Class for retrieving various kinds of information related to the application @@ -4668,6 +4671,32 @@ public abstract class PackageManager { public abstract List getAllPermissionGroups( @PermissionGroupInfoFlags int flags); + /** + * Get the platform permissions which belong to a particular permission group. + * + * @param permissionGroupName The permission group whose permissions are desired + * @param executor Executor on which to invoke the callback + * @param callback A callback which will receive a list of the platform permissions in the + * group, or empty if the group is not a valid platform group, or there + * was an exception. + */ + public void getPlatformPermissionsForGroup(@NonNull String permissionGroupName, + @NonNull @CallbackExecutor Executor executor, + @NonNull Consumer> callback) {} + + /** + * Get the platform group of a particular permission, if the permission is a platform + * permission. + * + * @param permissionName The permission name whose group is desired + * @param executor Executor on which to invoke the callback + * @param callback A callback which will receive the name of the permission group this + * permission belongs to, or null if it has no group, is not a platform + * permission, or there was an exception. + */ + public void getGroupOfPlatformPermission(@NonNull String permissionName, + @NonNull @CallbackExecutor Executor executor, @NonNull Consumer callback) {} + /** * Retrieve all of the information we know about a particular * package/application. diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java index ca132e975e857..00f9e45fa22ef 100644 --- a/core/java/android/permission/PermissionControllerManager.java +++ b/core/java/android/permission/PermissionControllerManager.java @@ -729,13 +729,12 @@ public final class PermissionControllerManager { * @param callback A callback which will receive a list of the platform permissions in the * group, or empty if the group is not a valid platform group, or there * was an exception. + * + * @hide */ - @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING) public void getPlatformPermissionsForGroup(@NonNull String permissionGroupName, @NonNull @CallbackExecutor Executor executor, @NonNull Consumer> callback) { - enforceSomePermissionsGrantedToSelf( - Manifest.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING); mRemoteService.postAsync(service -> { AndroidFuture> future = new AndroidFuture<>(); service.getPlatformPermissionsForGroup(permissionGroupName, future); @@ -764,12 +763,11 @@ public final class PermissionControllerManager { * @param callback A callback which will receive the name of the permission group this * permission belongs to, or null if it has no group, is not a platform * permission, or there was an exception. + * + * @hide */ - @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING) public void getGroupOfPlatformPermission(@NonNull String permissionName, @NonNull @CallbackExecutor Executor executor, @NonNull Consumer callback) { - enforceSomePermissionsGrantedToSelf( - Manifest.permission.GET_RUNTIME_PERMISSION_GROUP_MAPPING); mRemoteService.postAsync(service -> { AndroidFuture future = new AndroidFuture<>(); service.getGroupOfPlatformPermission(permissionName, future); diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bb409db0a95db..084d4d1c0c42f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4232,11 +4232,6 @@ - - -