Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f15d2905 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

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

Merge "Enforce permission checks in getting app exit reasons" into rvc-dev am: f36b9764 am: 23f15967

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539768

Change-Id: I1eeadd72ae3315f781b61439c29dcf85e50d4203
parents a7578af1 23f15967

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

+2 −4
Original line number Diff line number Diff line
@@ -8184,12 +8184,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;