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

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

Browse Source 
See b/208785537#comment11.

Bug: 208785537
Bug: 206556385
Bug: 183537857
Fixes: 203175819
Test: presubmit
Change-Id: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
Merged-In: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
(cherry picked from commit e6f07a4fb2)
This commit is contained in:
Hai Zhang
2021-12-14 12:36:36 +00:00
parent f1cd6678f5
commit b0b2863467
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

@@ -434,7 +434,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;
} }