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

Merge "Merge "Don't sync app op mode for root and system uid." into rvc-dev am: 797afd58f8 am: ca81664327" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-06-23 23:54:16 +00:00
committed by Android (Google) Code Review
parent 0ed7e14d68 3ea8ecf3ee
commit 7df266795e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -825,7 +825,15 @@ public final class PermissionPolicyService extends SystemService {
return;
}
if (pkgInfo == null || pkg == null || pkgInfo.requestedPermissions == null) {
if (pkgInfo == null || pkg == null || pkgInfo.applicationInfo == null
|| pkgInfo.requestedPermissions == null) {
return;
}
final int uid = pkgInfo.applicationInfo.uid;
if (uid == Process.ROOT_UID || uid == Process.SYSTEM_UID) {
// Root and system server always pass permission checks, so don't touch their app
// ops to keep compatibility.
return;
}