From 3c2731fdce14bf99a043e8c4bd214fd6fb11160f Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Fri, 31 May 2019 08:48:14 -0700 Subject: [PATCH] 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 Bug: 134161027 Change-Id: I7bc986f0d3e69dd60a017f16867182163fd6eecb --- .../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 beb72686d6cee..81dd868ca8e9b 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 && !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.