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

Commit c4bc955d authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

Whitelist permission before trying to grant it for role.

am: a74705b7

Change-Id: I5b3e842448ee1d5b3d6876baf53a8886d0577454
parents 731045b0 a74705b7
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -168,15 +168,15 @@ public class Permissions {
        for (int i = 0; i < sortedPermissionsToGrantLength; i++) {
            String permission = sortedPermissionsToGrant[i];

            permissionOrAppOpChanged |= grantSingle(packageName, permission,
                    overrideUserSetAndFixed, setGrantedByRole, setGrantedByDefault, setSystemFixed,
                    context);

            if ((smsPermissions.contains(permission) || callLogPermissions.contains(permission))
                    && whitelistedRestrictedPermissions.add(permission)) {
                packageManager.addWhitelistedRestrictedPermission(packageName, permission,
                        PackageManager.FLAG_PERMISSION_WHITELIST_SYSTEM);
            }

            permissionOrAppOpChanged |= grantSingle(packageName, permission,
                    overrideUserSetAndFixed, setGrantedByRole, setGrantedByDefault, setSystemFixed,
                    context);
        }

        return permissionOrAppOpChanged;