Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16549700

Change-Id: I39142a3cbd0587e6e64363ff94f04e3849593b7f
This commit is contained in:
TreeHugger Robot
2022-01-04 19:01:12 +00:00
committed by Automerger Merge Worker
parent 637ebd35aa 238c6d65d0
commit 7839a19f4e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
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;
} }