Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py

Issue 818653002: Fix SysfsPowerMonitor to let it work even if |browser| is None (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stderr
Patch Set: Address comments Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/telemetry/telemetry/core/platform/power_monitor/sysfs_power_monitor.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2e8d36f3715af4864015fbfd896e69ee87ba61ee..125e4c6081d5ac2e2b00ac6056181dd987163403 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
@@ -23,6 +23,7 @@ class DumpsysPowerMonitor(sysfs_power_monitor.SysfsPowerMonitor):
platform_backend: A LinuxBasedPlatformBackend instance.
"""
super(DumpsysPowerMonitor, self).__init__(platform_backend)
+ self._browser = None
self._device = device
def CanMonitorPower(self):
@@ -30,6 +31,7 @@ class DumpsysPowerMonitor(sysfs_power_monitor.SysfsPowerMonitor):
def StartMonitoringPower(self, browser):
super(DumpsysPowerMonitor, self).StartMonitoringPower(browser)
+ self._browser = browser
# Disable the charging of the device over USB. This is necessary because the
# device only collects information about power usage when the device is not
# charging.
@@ -37,8 +39,8 @@ class DumpsysPowerMonitor(sysfs_power_monitor.SysfsPowerMonitor):
def StopMonitoringPower(self):
if self._browser:
- # pylint: disable=W0212
package = self._browser._browser_backend.package
+ self._browser = None
cpu_stats = super(DumpsysPowerMonitor, self).StopMonitoringPower()
self._device.old_interface.EnableUsbCharging()
# By default, 'dumpsys batterystats' measures power consumption during the
« no previous file with comments | « no previous file | tools/telemetry/telemetry/core/platform/power_monitor/sysfs_power_monitor.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698