From d73a8bae4326267c54e3a832c230a11716b89da1 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Fri, 31 May 2019 23:35:33 +0000
Subject: [PATCH] Revert "Reset SYSTEM_FIXED flags for hard restricted perms"

This reverts commit 3c2731fdce14bf99a043e8c4bd214fd6fb11160f.

Reason for revert: This was only needed to unbreak internal dogfooding

Test: This is a clean revert
Bug: 134161027
Change-Id: I309bc5158190da71fc0ba867a5d15c6260623ed5
---
 .../android/server/pm/permission/PermissionManagerService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 81dd868ca8e9b..beb72686d6cee 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 @@ 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.