Index: tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py |
diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py |
index 5e7f3079b7263d2ee0e4215cf5216356a969dcc5..649d9d1fb915d3a0589fe3c60b5f33174b75440a 100644 |
--- a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py |
+++ b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py |
@@ -27,7 +27,14 @@ class DumpsysPowerMonitor(sysfs_power_monitor.SysfsPowerMonitor): |
self._device = device |
def CanMonitorPower(self): |
- return self._device.old_interface.CanControlUsbCharging() |
+ result = self._platform.RunCommand('dumpsys batterystats -c') |
+ DUMP_VERSION_INDEX = 0 |
+ csvreader = csv.reader(result) |
+ # Dumpsys power data is present in dumpsys versions 8 and 9 |
+ # which is found on L+ devices. |
+ if csvreader.next()[DUMP_VERSION_INDEX] in ['8', '9']: |
+ return True |
+ return False |
def StartMonitoringPower(self, browser): |
super(DumpsysPowerMonitor, self).StartMonitoringPower(browser) |