From e9b1dd415fed5415bc21abbd8e2f653fda5cf30c Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Fri, 28 Aug 2020 14:55:48 -0700
Subject: [PATCH] Enforce permission checks in getting app exit reasons

Bug: 165595677
Test: atest CtsSecurityTestCases:ActivityManagerTest
Change-Id: Ia758d32bce6b2ac4c7145a96eccf68a962f0748b
---
 .../java/com/android/server/am/ActivityManagerService.java  | 6 ++----
 1 file 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 82abb988cb2c9..e75d54f8ac9f7 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 @@ 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;