commit 1c5689ba4a4c41f38b58349d0982744243f0ff19
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 07 02:27:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 02:27:08 2018 +0000
tree 5c7195349d98d57284fac3f64e47a5d3a5f6c58f
parent 5b58ce4acccb816062befe83a221ccaadadc7a37
parent 2ddfc7e1310cef57bec436e28b03303e3e368932

Merge "Allow ROOT_UID to execute privileged shell cmds"

src/com/android/phone/TelephonyShellCommand.java

diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 6cec56c..9250118 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -450,6 +450,8 @@
     }
 
     private boolean checkShellUid() {
-        return Binder.getCallingUid() == Process.SHELL_UID;
+        // adb can run as root or as shell, depending on whether the device is rooted.
+        return Binder.getCallingUid() == Process.SHELL_UID
+                || Binder.getCallingUid() == Process.ROOT_UID;
     }
 }