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

Commit 9bf307ca authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Rename deviceId variable 

Bug: n/a
Test: n/a
Flag: EXEMPT trivial refactor
Change-Id: Iabf2408c62405d410daf0565367dfc2e4c7f0c63
parent 42557184

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

    }