commit e9b1dd415fed5415bc21abbd8e2f653fda5cf30c
author Jing Ji <jji@google.com> Fri Aug 28 14:55:48 2020 -0700
committer Jing Ji <jji@google.com> Tue Sep 08 13:05:17 2020 -0700
tree d30cbe2dd1a651f20a012d6a7eae79a5eb7e2530
parent 2c0137794dcc2c8be26eddb251488b8e64e6e3f3

Enforce permission checks in getting app exit reasons

Bug: 165595677
Test: atest CtsSecurityTestCases:ActivityManagerTest
Change-Id: Ia758d32bce6b2ac4c7145a96eccf68a962f0748b

services/core/java/com/android/server/am/ActivityManagerService.java

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;