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

Commit e327817f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Adding in verification of calling UID in onShellCommand"" into... 

Merge "Revert "Adding in verification of calling UID in onShellCommand"" into rvc-dev am: 75aaa4c2

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



Change-Id: I1f70daf5f34bcb4a1f920b72eb5187303db87d76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 976d59d1 75aaa4c2

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

+0 −7
Original line number Diff line number Diff line
@@ -10629,13 +10629,6 @@ 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);

    }