Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev...

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

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



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

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

@@ -8674,6 +8674,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);
     }