Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ec6264 authored by Yuting Fang's avatar Yuting Fang
Browse files

Update PermissionManager#checkPermission API based on API council feedback 

1. Added description of persistentDeviceId in java doc
2. Change checkPermission() from a static method to instance method

Bug: 325215352
Test: atest DevicePermissionsTest
Change-Id: I46dd3208a6354650e5b52052f1c12000f1a08680
parent 7757f462

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11531,7 +11531,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);

























core/java/android/permission/PermissionManager.java



+7
−5






























Original line number
Diff line number
Diff line








@@ -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()));















    }































    /**