[Android] Switch to DeviceUtils version of RunShellCommand.

build/android/pylib/perf/surface_stats_collector.py

 # Copyright 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.
 
 import Queue
 import datetime
 import logging
 import re
 import threading
 from pylib import android_commands
@@ skipping 197 matching lines @@
 
   def _ClearSurfaceFlingerLatencyData(self):
     """Clears the SurfaceFlinger latency data.
 
     Returns:
       True if SurfaceFlinger latency is supported by the device, otherwise
       False.
     """
     # The command returns nothing if it is supported, otherwise returns many
     # lines of result just like 'dumpsys SurfaceFlinger'.
-    results = self._device.old_interface.RunShellCommand(
+    results = self._device.RunShellCommand(
         'dumpsys SurfaceFlinger --latency-clear SurfaceView')
     return not len(results)
 
   def _GetSurfaceFlingerFrameData(self):
     """Returns collected SurfaceFlinger frame timing data.
 
     Returns:
       A tuple containing:
       - The display's nominal refresh period in seconds.
       - A list of timestamps signifying frame presentation times in seconds.
@@ skipping 22 matching lines @@
     #
     # ceil((C - A) / refresh-period)
     #
     # (each time the number above changes, we have a "jank").
     # If this happens a lot during an animation, the animation appears
     # janky, even if it runs at 60 fps in average.
     #
     # We use the special "SurfaceView" window name because the statistics for
     # the activity's main window are not updated when the main web content is
     # composited into a SurfaceView.
-    results = self._device.old_interface.RunShellCommand(
-        'dumpsys SurfaceFlinger --latency SurfaceView',
-        log_result=logging.getLogger().isEnabledFor(logging.DEBUG))
+    results = self._device.RunShellCommand(
+        'dumpsys SurfaceFlinger --latency SurfaceView')
     if not len(results):
       return (None, None)
 
     timestamps = []
     nanoseconds_per_second = 1e9
     refresh_period = long(results[0]) / nanoseconds_per_second
 
     # If a fence associated with a frame is still pending when we query the
     # latency data, SurfaceFlinger gives the frame a timestamp of INT64_MAX.
     # Since we only care about completed frames, we will ignore any timestamps
@@ skipping 15 matching lines @@
   def _GetSurfaceStatsLegacy(self):
     """Legacy method (before JellyBean), returns the current Surface index
        and timestamp.
 
     Calculate FPS by measuring the difference of Surface index returned by
     SurfaceFlinger in a period of time.
 
     Returns:
       Dict of {page_flip_count (or 0 if there was an error), timestamp}.
     """
-    results = self._device.old_interface.RunShellCommand(
-        'service call SurfaceFlinger 1013')
+    results = self._device.RunShellCommand('service call SurfaceFlinger 1013')
     assert len(results) == 1
     match = re.search('^Result: Parcel\((\w+)', results[0])
     cur_surface = 0
     if match:
       try:
         cur_surface = int(match.group(1), 16)
       except Exception:
         logging.error('Failed to parse current surface from ' + match.group(1))
     else:
       logging.warning('Failed to call SurfaceFlinger surface ' + results[0])
     return {
         'page_flip_count': cur_surface,
         'timestamp': datetime.datetime.now(),
     }