Merge "Don't create system fixed, revoked permissions" into qt-dev

am: ed225f65b0 Change-Id: Id029db4f5cec3799788ff18967a5ad0932008e90
2019-05-31 14:39:46 -07:00
parent 8e22543ba4 ed225f65b0
commit 260eb1893e
1 changed files with 8 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1173,6 +1173,14 @@ public class PermissionManagerService {
                                    }
                                }

+                                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.
+                                    flags &= ~FLAG_PERMISSION_SYSTEM_FIXED;
+                                    wasChanged = true;
+                                }
+
                                if (wasChanged) {
                                    updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);
                                }