commit 528a357491667bd38d0de659b4eba26b8a7173a5
author Philip P. Moltmann <moltmann@google.com> Fri May 31 08:48:14 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 31 18:39:30 2019 +0000
tree c0165e1dda589d09388e74e6cdccd85a26dca9be
parent 48b1fed0964145bf2e2d680c99e9be11a883d57e

Reset SYSTEM_FIXED flags for hard restricted perms

So that incorrectly SYSTEM_FIXED / denied permissions will be able to
get regrated via the default permission grant policy

This can be removed after all devices have been fixed

Test: Got system into the state with SYSTEM_FIXED / denied permission
      and then silulated an OTA with this change
Bug: 134069814

Change-Id: I7bc986f0d3e69dd60a017f16867182163fd6eecb
(cherry picked from commit 0891123822d6173686e9772c3265b72c27b2b901)

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 beb7268..81dd868 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 && !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.