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

Commit e1c2448e 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: f36b9764 

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

Change-Id: Id940ce41057abef319a7d83ca93bc3d3468ab71c
parents acc8972d f36b9764

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

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