Android Telemetry: automates devices running "user" build.

tools/telemetry/telemetry/android_browser_backend.py

Index: tools/telemetry/telemetry/android_browser_backend.py
diff --git a/tools/telemetry/telemetry/android_browser_backend.py b/tools/telemetry/telemetry/android_browser_backend.py
index 612515e937ed85e986a65e09455c88be86ba000d..b4bd7bd39b0a6b6442510c1200deaa452ca9adb1 100644
--- a/tools/telemetry/telemetry/android_browser_backend.py
+++ b/tools/telemetry/telemetry/android_browser_backend.py
@@ -67,8 +67,8 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
       f.flush()
       self._adb.Push(f.name, cmdline_file)
 
-    # Force devtools protocol on, if not already done.
-    if not is_content_shell and self._adb.IsRootEnabled():
+    # Force devtools protocol on, if not already done and we can use "su".
+    if not is_content_shell and self._adb.RunShellCommand('su -c echo') == ['']:
       # Make sure we can find the apps' prefs file
       app_data_dir = '/data/data/%s' % self._package
       prefs_file = (app_data_dir +
@@ -83,7 +83,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
         retries = 0
         timeout = 3
         time.sleep(timeout)
-        while not self._adb.Adb().GetFileContents(prefs_file):
+        while not self._adb.Adb().GetProtectedFileContents(prefs_file):
           time.sleep(timeout)
           retries += 1
           timeout *= 2
@@ -93,30 +93,25 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
                              prefs_file, self._package)
             raise browser_gone_exception.BrowserGoneException(
                 'Missing preferences file.')
-        self._adb.KillAll(self._package)
-
-      with tempfile.NamedTemporaryFile() as raw_f:
-        self._adb.Pull(prefs_file, raw_f.name)
-        with open(raw_f.name, 'r') as f:
-          txt_in = f.read()
-          preferences = json.loads(txt_in)
-        changed = False
-        if 'devtools' not in preferences:
-          preferences['devtools'] = {}
-          changed = True
-        if 'remote_enabled' not in preferences['devtools']:
-          preferences['devtools']['remote_enabled'] = True
-          changed = True
-        if preferences['devtools']['remote_enabled'] != True:
-          preferences['devtools']['remote_enabled'] = True
-          changed = True
-        if changed:
-          logging.warning('Manually enabled devtools protocol on %s' %
-                          self._package)
-          with open(raw_f.name, 'w') as f:
-            txt = json.dumps(preferences, indent=2)
-            f.write(txt)
-          self._adb.Push(raw_f.name, prefs_file)
+        self._adb.CloseApplication(self._package)

[Sami, 2013/02/11 14:57:13]

I wonder if Chrome rewrites the preferences at exit? We could have a race
between that happening and reading the prefs below. If you haven't seen anything
like this, feel free to ignore.

[bulach, 2013/02/11 18:47:25]

hmm, it probably does, but I haven't seen this being issue... afaict, the
preferences are atomic, so worst case is that this would not contain the full
set. but it shouldn't really matter, as this whole block would only be triggered
on the very fist run..

I'll leave as is for the time being..

+
+      preferences = json.loads(''.join(
+          self._adb.Adb().GetProtectedFileContents(prefs_file)))
+      changed = False
+      if 'devtools' not in preferences:
+        preferences['devtools'] = {}
+        changed = True
+      if 'remote_enabled' not in preferences['devtools']:
+        preferences['devtools']['remote_enabled'] = True
+        changed = True
+      if preferences['devtools']['remote_enabled'] != True:

[Sami, 2013/02/11 14:57:13]

Nit: could be combined with the 'if' above.

[bulach, 2013/02/11 18:47:25]

Done.

+        preferences['devtools']['remote_enabled'] = True
+        changed = True
+      if changed:
+        logging.warning('Manually enabled devtools protocol on %s' %
+                        self._package)
+        txt = json.dumps(preferences, indent=2)
+        self._adb.Adb().SetProtectedFileContents(prefs_file, txt)
 
     # Start it up with a fresh log.
     self._adb.RunShellCommand('logcat -c')