tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py - Issue 243403003: [Android] Change object types from AndroidCommands to DeviceUtils everywhere else.

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/core/platform/power_monitor/android_temperature_monitor.py

Issue 243403003: [Android] Change object types from AndroidCommands to DeviceUtils everywhere else. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 8 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/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py ('k') | tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py

diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py b/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py

index 90d32a5ca2680b54927325f2e7bc31767dc50687..586551077968593dfb2fd863e9148cd4be740b1b 100644

--- a/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py

+++ b/tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py

@@ -13,9 +13,9 @@ class AndroidTemperatureMonitor(power_monitor.PowerMonitor):

Delegates monitoring to another PowerMonitor and adds temperature measurements

to overall results.

"""

- def __init__(self, monitor, adb):

+ def __init__(self, monitor, device):

super(AndroidTemperatureMonitor, self).__init__()

- self._adb = adb

+ self._device = device

self._power_monitor = monitor

self._can_monitor_with_power_monitor = None

@@ -58,7 +58,7 @@ class AndroidTemperatureMonitor(power_monitor.PowerMonitor):

return power_data

def _GetBoardTemperatureCelsius(self):

- contents = self._adb.GetFileContents(_TEMPERATURE_FILE)

+ contents = self._device.old_interface.GetFileContents(_TEMPERATURE_FILE)

if len(contents) > 0:

return float(contents[0])

return None