summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Ji <jji@google.com>2020-08-28 14:55:48 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-11-18 22:50:50 +0000
commit9ac71ec05aecd46d4569405a63f2033c06fe38ac (patch)
treea2db9ff7ea57db83fece561d50a36408444fb645
parenta185996c829a159bb27446697329b01464ab3c03 (diff)
downloadbase-9ac71ec05aecd46d4569405a63f2033c06fe38ac.tar.gz
Enforce permission checks in getting app exit reasons
Bug: 165595677 Test: atest CtsSecurityTestCases:ActivityManagerTest Change-Id: Ia758d32bce6b2ac4c7145a96eccf68a962f0748b (cherry picked from commit e9b1dd415fed5415bc21abbd8e2f653fda5cf30c)
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 3b8518004309..091c77ecaac3 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -10459,12 +10459,10 @@ public class ActivityManagerService extends IActivityManager.Stub
} 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;