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

2019-06-03 15:28:21 +00:00
parent ad3e86a742 d73a8bae43
commit 35e5db7a3f
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
+                                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.