Whitelist permission before trying to grant it for role.

Or otherwise the permission cannot be granted if it's not whitelisted
beforehand by something else.

Fixes: 135136001
Test: presubmit
Change-Id: I11fa97c8c31c1dfbc498158852dff18cf8e23a8d

1 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/packageinstaller/role/model/Permissions.java b/src/com/android/packageinstaller/role/model/Permissions.java
index 2ea5f530..46b3f6c5 100644
--- a/src/com/android/packageinstaller/role/model/Permissions.java
+++ b/src/com/android/packageinstaller/role/model/Permissions.java
@@ -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;