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

Merge "Enforce permission checks in getting app exit reasons" into rvc-dev

Browse Source
This commit is contained in:
Jing Ji
2020-10-06 00:45:31 +00:00
committed by Android (Google) Code Review
parent 52dec242d7 e9b1dd415f
commit f36b9764e0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -10475,12 +10475,10 @@ public class ActivityManagerService extends IActivityManager.Stub
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);
} }
if (uid == Process.INVALID_UID) { // If the uid is Process.INVALID_UID, the below 'if' check will be always true
return Process.INVALID_UID;
}
if (UserHandle.getAppId(uid) != UserHandle.getAppId(callingUid)) { if (UserHandle.getAppId(uid) != UserHandle.getAppId(callingUid)) {
// Requires the DUMP permission if the target package doesn't belong // Requires the DUMP permission if the target package doesn't belong
// to the caller. // to the caller or it doesn't exist.
enforceCallingPermission(android.Manifest.permission.DUMP, function); enforceCallingPermission(android.Manifest.permission.DUMP, function);
} }
return uid; return uid;