commit 969a52a60344a9c22e5a107f935a2dfc7544f16e
author Nate Myren <ntmyren@google.com> Wed Jul 26 16:09:01 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 26 16:09:01 2023 +0000
tree 6d718b8283aa2f8787702f968e8891a3547f9657
parent 040e83876d7d049c3db749dd1fe11e91c29c3fea
parent e7b8f467c071662e80d51e6531869711993529ad

Merge "Prevent some key system applications from losing storage permissions" into main

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 9ed5aa7..5221cfa 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -2116,6 +2116,12 @@
                 if (!isStorageOrMedia) {
                     continue;
                 }
+                boolean isSystemOrPolicyFixed = (getPermissionFlags(newPackage.getPackageName(),
+                        permInfo.name, userId) & (FLAG_PERMISSION_SYSTEM_FIXED
+                        | FLAG_PERMISSION_POLICY_FIXED)) != 0;
+                if (isSystemOrPolicyFixed) {
+                    continue;
+                }
 
                 EventLog.writeEvent(0x534e4554, "171430330", newPackage.getUid(),
                         "Revoking permission " + permInfo.name + " from package "