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

Commit add15d5d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename deviceId variable" into main

parents 1592073e 9bf307ca

core/java/android/permission/PermissionManager.java

+4 −4
Original line number Diff line number Diff line
@@ -1907,9 +1907,9 @@ public final class PermissionManager { 
    @Context.PermissionRequestState

    public int getPermissionRequestState(@NonNull String packageName, @NonNull String permission,

            int deviceId) {

        int actualDeviceId = resolveDeviceIdForPermissionCheck(mContext, deviceId, permission);

        int resolvedDeviceId = resolveDeviceIdForPermissionCheck(mContext, deviceId, permission);

        return sPermissionRequestStateCache.query(

                new PermissionRequestStateQuery(packageName, permission, actualDeviceId));

                new PermissionRequestStateQuery(packageName, permission, resolvedDeviceId));

    }



    /**
@@ -2036,8 +2036,8 @@ public final class PermissionManager { 
     */

    public int checkPackageNamePermission(String permName, String pkgName,

            int deviceId, @UserIdInt int userId) {

        int actualDeviceId = resolveDeviceIdForPermissionCheck(mContext, deviceId, permName);

        String persistentDeviceId = getPersistentDeviceId(actualDeviceId);

        int resolvedDeviceId = resolveDeviceIdForPermissionCheck(mContext, deviceId, permName);

        String persistentDeviceId = getPersistentDeviceId(resolvedDeviceId);

        return sPackageNamePermissionCache.query(

                new PackageNamePermissionQuery(permName, pkgName, persistentDeviceId, userId));

    }