| Index: telemetry/telemetry/internal/platform/android_device.py
|
| diff --git a/telemetry/telemetry/internal/platform/android_device.py b/telemetry/telemetry/internal/platform/android_device.py
|
| index 79345a6cbd9139df29acd7c29238c1d576cbecf3..286bd03f53802799ebbb66ef8d893761dae2ba73 100644
|
| --- a/telemetry/telemetry/internal/platform/android_device.py
|
| +++ b/telemetry/telemetry/internal/platform/android_device.py
|
| @@ -6,7 +6,6 @@ import logging
|
| import os
|
| import subprocess
|
|
|
| -from telemetry.core import util
|
| from telemetry.internal.platform import cros_device
|
| from telemetry.internal.platform import device
|
| from telemetry.internal.platform.profiler import monsoon
|
| @@ -16,6 +15,7 @@ from devil.android import device_errors
|
| from devil.android import device_utils
|
| from devil.android.sdk import adb_wrapper
|
|
|
| +import py_utils
|
|
|
| def _KillStrayADBProcesses():
|
| p = subprocess.Popen(['killall', 'adb'])
|
| @@ -97,7 +97,7 @@ The Monsoon's power output has been enabled. Please now ensure that:
|
|
|
| Waiting for device...
|
| """)
|
| - util.WaitFor(_ListSerialsOfHealthyOnlineDevices(blacklist), 600)
|
| + py_utils.WaitFor(_ListSerialsOfHealthyOnlineDevices(blacklist), 600)
|
| device_serials = _ListSerialsOfHealthyOnlineDevices(blacklist)
|
| except IOError:
|
| return []
|
|
|