| commit | 23f159677499c0638851ada544aefafff49b4cbb | [log] [tgz] |
|---|---|---|
| author | Jing Ji <jji@google.com> | Tue Oct 06 01:02:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 01:02:51 2020 +0000 |
| tree | b7042fc93c4e17a92f44f544fb281b3a1e809c34 | |
| parent | ddb6bdf1677217376de8f06d3d0cb4e0fa49f5f8 [diff] | |
| parent | f36b9764e04028132a18545036c2aac87980e847 [diff] |
Merge "Enforce permission checks in getting app exit reasons" into rvc-dev am: f36b9764e0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539768 Change-Id: I81380dfc942e4c5e17f2fd01f92a186d289c4bf7
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 82abb98..e75d54f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -10475,12 +10475,10 @@ } finally { Binder.restoreCallingIdentity(identity); } - if (uid == Process.INVALID_UID) { - return Process.INVALID_UID; - } + // If the uid is Process.INVALID_UID, the below 'if' check will be always true if (UserHandle.getAppId(uid) != UserHandle.getAppId(callingUid)) { // 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); } return uid;