commit 4e88beaefab96ca0e35a494902b8bf37da87ae40
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 21 00:48:51 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 21 00:48:51 2024 +0000
tree e2bc3e1ffaeb42076e11642588e15054b08cd77a
parent 8e5af38344b00da10dd183cd6220b996e062dc86
parent d6f0e9825d3be1c4e3f4ad45712ef4bfa7eca3e6

Merge "Revert "Adding in verification of calling UID in onShellCommand"" into rvc-dev am: 75aaa4c2ea am: e327817f65 am: c4cd5efae8 am: d03e368756 am: fb517df3a7 am: 768f53651e am: d6f0e9825d

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

Change-Id: I992ba0cac3f1743fbd43e9ccb527150c82eb92d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 7d2ec4c..46adc79 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -9707,13 +9707,6 @@
     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);
     }