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

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

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

Change-Id: I4bfaf78ef26290490b59b58a3c792f3016c49f13
parents 66bd3dc2 e1c2448e

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;