From 30014a7202da0ad6b15306eb3c1cc8d929813e26 Mon Sep 17 00:00:00 2001 From: Kunal Malhotra Date: Fri, 9 Feb 2024 19:26:24 +0000 Subject: Revert "Adding in verification of calling UID in onShellCommand" This reverts commit 3ef3f18ba3094c4cc4f954ba23d1da421f9ca8b0. Reason for revert: We want UID permissions to be checked by individual commands themselves. Merged-In: I30e993a848a4cab819f2b3d7958f279806e1f530 Change-Id: I3e196a0c14b631a47d95ced3d65d0ba39e38cc2e --- .../core/java/com/android/server/am/ActivityManagerService.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 90bd8c05aac6..29ccca6af1c5 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -10608,13 +10608,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); } -- cgit v1.2.3-59-g8ed1b