[telemetry] Fix Android surface statistics collector

build/android/pylib/surface_stats_collector.py

 # Copyright (c) 2012 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 perf_tests_helper
 
 
 # Log marker containing SurfaceTexture timestamps.
 _SURFACE_TEXTURE_TIMESTAMPS_MESSAGE = 'SurfaceTexture update timestamps'
 _SURFACE_TEXTURE_TIMESTAMP_RE = '\d+'
 
 
 class SurfaceStatsCollector(object):
-  """Collects surface stats for a window from the output of SurfaceFlinger.
+  """Collects surface stats for a SurfaceView from the output of SurfaceFlinger.
 
   Args:
-    adb: the adb coonection to use.
-    window_package: Package name of the window.
-    window_activity: Activity name of the window.
+    adb: the adb connection to use.
   """
-  def __init__(self, adb, window_package, window_activity, trace_tag):
+  def __init__(self, adb, trace_tag):
     self._adb = adb
-    self._window_package = window_package
-    self._window_activity = window_activity
     self._trace_tag = trace_tag
     self._collector_thread = None
     self._use_legacy_method = False
     self._surface_before = None
     self._get_data_event = None
     self._data_queue = None
     self._stop_event = None
 
   def __enter__(self):
     assert not self._collector_thread
@@ skipping 103 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._adb.RunShellCommand(
-        'dumpsys SurfaceFlinger --latency-clear %s/%s' %
-        (self._window_package, self._window_activity))
+        'dumpsys SurfaceFlinger --latency-clear SurfaceView')
     return not len(results)
 
   def _GetSurfaceFlingerLatencyData(self, previous_timestamp, latencies):
     """Returns collected SurfaceFlinger latency data.
 
     Args:
       previous_timestamp: The timestamp returned from the previous call or 0.
           Only data after this timestamp will be returned.
       latencies: A list to receive latency data. The latencies are integers
           each of which is the number of refresh periods of each frame.
@@ skipping 23 matching lines @@
     #
     # The difference between the 1st and 3rd timestamp is the frame-latency.
     # An interesting data is when the frame latency crosses a refresh period
     # boundary, this can be calculated this way:
     #
     # 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._adb.RunShellCommand(
-        'dumpsys SurfaceFlinger --latency %s/%s' %
-        (self._window_package, self._window_activity), log_result=True)
+        'dumpsys SurfaceFlinger --latency SurfaceView', log_result=True)
     if not len(results):
       return (None, None)
 
     refresh_period = int(results[0])
     last_timestamp = previous_timestamp
     first_timestamp = 0
     for line in results[1:]:
       fields = line.split()
       if len(fields) == 3:
         timestamp = long(fields[0])
@@ skipping 24 matching lines @@
       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(),
     }