commit 35e5db7a3f137acaa118aed805d616510dbc2dbe
author Philip P. Moltmann <moltmann@google.com> Mon Jun 03 15:28:21 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 03 15:28:21 2019 +0000
tree c5f709bfce6c1486bfe24291b54398a4b759d19b
parent ad3e86a742b0b5e1700a30f1f9053f8ec3730016
parent d73a8bae4326267c54e3a832c230a11716b89da1

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

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 81dd868..beb7268 100644
--- 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 @@
                                     }
                                 }
 
-                                if (hardRestricted
+                                if (hardRestricted && !restrictionExempt
                                         && (flags & FLAG_PERMISSION_SYSTEM_FIXED) != 0) {
                                     // Applying a hard restriction implies revoking it. This might
                                     // lead to a system-fixed, revoked permission.