Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev

am: 164404bfcb Change-Id: Idb2ee6f3af63729e6c98fcc6f4199a1efd9502f8
2019-05-31 16:48:53 -07:00
parent 65c03c6951 164404bfcb
commit b7e50e3220
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1173,7 +1173,7 @@ public class PermissionManagerService {
                                    }
                                }

-                                if (hardRestricted && !restrictionExempt
+                                if (hardRestricted
                                        && (flags & FLAG_PERMISSION_SYSTEM_FIXED) != 0) {
                                    // Applying a hard restriction implies revoking it. This might
                                    // lead to a system-fixed, revoked permission.