Disable adb root default call in android_commands

build/android/pylib/android_commands.py

Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index da87f39f4dae86130a6507681404fa322fc808f0..c0863e0a12ce1a4a67c8ed28d7e2175af174408f 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -224,9 +224,8 @@ class AndroidCommands(object):
     self._adb = adb_interface.AdbInterface()
     if device:
       self._adb.SetTargetSerial(device)
-    # So many users require root that we just always do it. This could
-    # be made more fine grain if necessary.
-    self._root_enabled = self._adb.EnableAdbRoot()
+    root_test_output = self.RunShellCommand('ls /root')[0]
+    self._root_enabled = not 'Permission denied' in root_test_output
     self._logcat = None
     self._original_governor = None
     self._pushed_files = []
@@ -236,6 +235,10 @@ class AndroidCommands(object):
     """Returns our AdbInterface to avoid us wrapping all its methods."""
     return self._adb
 
+  def EnableAdbRoot(self):
+    self._root_enabled = self.Adb().EnableAdbRoot()

[Satish, 2012/08/17 09:32:58]

I see in __init__ we check if adb is already in root mode and set this flag. So
can we check if that is true already and if so return early instead of trying to
enable root and wait again?

[Isaac (away), 2012/08/17 09:34:37]

sure.  This function isn't called right now and might be culled entirely.  But
if I do hook into it I will add that.

+    self._adb.SendCommand('wait-for-device')
+
   def IsRootEnabled(self):
     """Returns whether or not _adb.EnabledAdbRoot() has succeeded."""
     return self._root_enabled