Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." am: 547654cab7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1935975

Change-Id: I5fdc4d499ea064b85c14d7f5a02a661e39c4ac81
This commit is contained in:
Treehugger Robot
2022-01-04 23:52:20 +00:00
committed by Automerger Merge Worker

View File

@@ -435,7 +435,8 @@ final class DefaultPermissionGrantPolicy {
|| !pm.isGranted(Manifest.permission.READ_PRIVILEGED_PHONE_STATE, || !pm.isGranted(Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
pkg, UserHandle.of(userId)) pkg, UserHandle.of(userId))
|| !pm.isGranted(Manifest.permission.READ_PHONE_STATE, pkg, || !pm.isGranted(Manifest.permission.READ_PHONE_STATE, pkg,
UserHandle.of(userId))) { UserHandle.of(userId))
|| pm.isSysComponentOrPersistentPlatformSignedPrivApp(pkg)) {
continue; continue;
} }