Merge "Don't create system fixed, revoked permissions" into qt-dev am: ed225f65b0 am: 260eb1893e

am: 85db44d908 Change-Id: Id10507f327866073b98c9599d05e2728c15cd587
2019-05-31 15:01:22 -07:00
parent f9da1519e9 85db44d908
commit 98948334ee
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
@@ -1178,6 +1178,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);
                                }