commit 547654cab7c97ad53ab25817ffa7ccadaba41fcb
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 04 23:34:38 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 04 23:34:38 2022 +0000
tree 62ea323645577d747053ca82bf92f17c501973c1
parent ed021212d60a20c15dc09babd4e731dac11d0a29
parent cc0a80895fdd9d0a29c55047c22eee7a07e9dc92

Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps."

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

diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index 46cb720..186b2b5 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -435,7 +435,8 @@
                     || !pm.isGranted(Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
                             pkg, UserHandle.of(userId))
                     || !pm.isGranted(Manifest.permission.READ_PHONE_STATE, pkg,
-                            UserHandle.of(userId))) {
+                            UserHandle.of(userId))
+                    || pm.isSysComponentOrPersistentPlatformSignedPrivApp(pkg)) {
                 continue;
             }