tools/telemetry/telemetry/internal/platform/android_platform_backend.py - Issue 1252923003: Revert of [Android][Telemetry] Add support for multiple power monitors

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/internal/platform/android_platform_backend.py

Issue 1252923003: Revert of [Android][Telemetry] Add support for multiple power monitors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 months 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 | « tools/perf/metrics/power.py ('k') | tools/telemetry/telemetry/internal/platform/power_monitor/android_dumpsys_power_monitor.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/internal/platform/android_platform_backend.py

diff --git a/tools/telemetry/telemetry/internal/platform/android_platform_backend.py b/tools/telemetry/telemetry/internal/platform/android_platform_backend.py

index 99da467f7c325910e4bc9c153c9d0de508452895..dc93b3062b0beea845ab095754244023b6c78d81 100644

--- a/tools/telemetry/telemetry/internal/platform/android_platform_backend.py

+++ b/tools/telemetry/telemetry/internal/platform/android_platform_backend.py

@@ -24,7 +24,6 @@

from telemetry.internal.platform.power_monitor import android_temperature_monitor

from telemetry.internal.platform.power_monitor import monsoon_power_monitor

from telemetry.internal.platform.power_monitor import power_monitor_controller

-from telemetry.internal.platform.power_monitor import sysfs_power_monitor

from telemetry.internal.platform.profiler import android_prebuilt_profiler_helper

from telemetry.internal.util import exception_formatter

from telemetry.internal.util import external_modules

@@ -166,7 +165,6 @@

power_controller = power_monitor_controller.PowerMonitorController([

monsoon_power_monitor.MonsoonPowerMonitor(self._device, self),

android_dumpsys_power_monitor.DumpsysPowerMonitor(self._battery, self),

- sysfs_power_monitor.SysfsPowerMonitor(self, standalone=True),

], self._battery)

self._power_monitor = android_temperature_monitor.AndroidTemperatureMonitor(

power_controller, self._device)