Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." into sc-v2-dev

2022-01-04 18:45:44 +00:00
parent 5a2d06b5f1 b0b2863467
commit 238c6d65d0
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -434,7 +434,8 @@ final class DefaultPermissionGrantPolicy {
                    || !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;
            }