diff options
| author | 2024-02-23 21:39:30 +0000 | |
|---|---|---|
| committer | 2024-02-23 21:39:30 +0000 | |
| commit | 39d7066db68d6bbe4ad9c77f90376b74b01761a9 (patch) | |
| tree | 26ad1128f9a806ff7dc1902527f9b5727ac730c2 | |
| parent | 60e32db4af5015539076474d44565d94781c4646 (diff) | |
| parent | d7ec62641f70765531ac7cf5ad7b0044087848f7 (diff) | |
Merge "Update PermissionManager#checkPermission API based on API council feedback" into main
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/permission/PermissionManager.java | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index c473e1e49a4f..062bdaad9f7f 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -11530,7 +11530,7 @@ package android.permission { public final class PermissionManager { method public int checkDeviceIdentifierAccess(@Nullable String, @Nullable String, @Nullable String, int, int); - method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public static int checkPermission(@NonNull String, @NonNull String, @NonNull String, int); + method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public int checkPermission(@NonNull String, @NonNull String, @NonNull String); method @RequiresPermission(value=android.Manifest.permission.UPDATE_APP_OPS_STATS, conditional=true) public int checkPermissionForDataDelivery(@NonNull String, @NonNull android.content.AttributionSource, @Nullable String); method @RequiresPermission(value=android.Manifest.permission.UPDATE_APP_OPS_STATS, conditional=true) public int checkPermissionForDataDeliveryFromDataSource(@NonNull String, @NonNull android.content.AttributionSource, @Nullable String); method public int checkPermissionForPreflight(@NonNull String, @NonNull android.content.AttributionSource); diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index fd52c769e408..8495f3747573 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -1944,25 +1944,27 @@ public final class PermissionManager { * * @param permissionName The name of the permission you are checking for. * @param packageName The name of the package you are checking against. - * @param persistentDeviceId The persistent device id you are checking against. - * @param userId The user Id associated with context. + * @param persistentDeviceId The id of the physical device that you are checking permission + * against. * * @return If the package has the permission on the device, PERMISSION_GRANTED is * returned. If it does not have the permission on the device, PERMISSION_DENIED * is returned. * + * @see VirtualDevice#getPersistentDeviceId() * @see PackageManager#PERMISSION_GRANTED * @see PackageManager#PERMISSION_DENIED * * @hide */ @SystemApi + @PermissionResult @FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED) - public static int checkPermission(@NonNull String permissionName, @NonNull String packageName, - @NonNull String persistentDeviceId, @UserIdInt int userId) { + public int checkPermission(@NonNull String permissionName, @NonNull String packageName, + @NonNull String persistentDeviceId) { return sPackageNamePermissionCache.query( new PackageNamePermissionQuery(permissionName, packageName, persistentDeviceId, - userId)); + mContext.getUserId())); } /** |