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

Commit ca34073d authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 

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



Change-Id: Iea462e7f2dbeaa3e448cb3da33e5ad8684041495
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f8e0db4 7c905e10

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

+7 −0
Original line number Diff line number Diff line
@@ -10617,6 +10617,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
    public void onShellCommand(FileDescriptor in, FileDescriptor out,

            FileDescriptor err, String[] args, ShellCallback callback,

            ResultReceiver resultReceiver) {

        final int callingUid = Binder.getCallingUid();

        if (callingUid != ROOT_UID && callingUid != Process.SHELL_UID) {

            if (resultReceiver != null) {

                resultReceiver.send(-1, null);

            }

            throw new SecurityException("Shell commands are only callable by root or shell");

        }

        (new ActivityManagerShellCommand(this, false)).exec(

                this, in, out, err, args, callback, resultReceiver);

    }