[Android] Fix UIAutomator test running.

build/android/pylib/uiautomator/test_runner.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Class for running uiautomator tests on a single device."""
 
 from pylib import constants
 from pylib import flag_changer
 from pylib.device import intent
 from pylib.instrumentation import test_options as instr_test_options
@@ skipping 56 matching lines @@
       if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test):
         self.flags.RemoveFlags(['--disable-fre'])
       else:
         self.flags.AddFlags(['--disable-fre'])
     self.device.StartActivity(
         intent.Intent(action='android.intent.action.MAIN',
                       activity=self._activity,
                       package=self._package),
         blocking=True,
         force_stop=True)
-    return self.device.old_interface.RunUIAutomatorTest(
-        test, self.test_pkg.GetPackageName(), timeout)
+    cmd = ['uiautomator', 'runtest', self.test_pkg.GetPackageName(),
+           '-e', 'class', test]
+    return self.device.RunShellCommand(cmd, timeout=timeout, retries=0)
+
+  #override
+  def _GenerateTestResult(self, test, instr_statuses, start_ms, duration_ms):
+    # uiautomator emits its summary status with INSTRUMENTATION_STATUS_CODE,
+    # not INSTRUMENTATION_CODE, so we have to drop if off the list of statuses.
+    return super(TestRunner, self)._GenerateTestResult(
+        test, instr_statuses[:-1], start_ms, duration_ms)