diff options
| author | rnephew <rnephew@chromium.org> | 2015-03-18 19:39:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-19 02:40:02 +0000 |
| commit | bb925603095b3a451cc912faeb159f8bfc2c218e (patch) | |
| tree | 41484a9d3ece56d5012e08625acf0dac14371a4e /build/android | |
| parent | c2af413b751be6f483351ec9dfb4b36e2b21e40e (diff) | |
| download | chromium_src-bb925603095b3a451cc912faeb159f8bfc2c218e.zip chromium_src-bb925603095b3a451cc912faeb159f8bfc2c218e.tar.gz chromium_src-bb925603095b3a451cc912faeb159f8bfc2c218e.tar.bz2 | |
[Android] Fix usb charging re-enabling on KK
The reset command takes upwards of 3 minutes on KK, this runs
the set usb 1 command so that it will set charging to on while it
is resetting.
BUG=
Review URL: https://codereview.chromium.org/1012383006
Cr-Commit-Position: refs/heads/master@{#321272}
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/pylib/device/device_utils.py | 2 | ||||
| -rwxr-xr-x | build/android/pylib/device/device_utils_test.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py index 1faca07..9f538e1 100644 --- a/build/android/pylib/device/device_utils.py +++ b/build/android/pylib/device/device_utils.py @@ -1554,6 +1554,8 @@ class DeviceUtils(object): def battery_updates_enabled(): return self.GetCharging() is True + self.RunShellCommand(['dumpsys', 'battery', 'set', 'usb', '1'], + check_return=True) self.RunShellCommand(['dumpsys', 'battery', 'reset'], check_return=True) timeout_retry.WaitFor(battery_updates_enabled, wait_period=1) diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py index 4317684c..98e3539 100755 --- a/build/android/pylib/device/device_utils_test.py +++ b/build/android/pylib/device/device_utils_test.py @@ -1553,6 +1553,8 @@ class DeviceUtilsSetBatteryMeasurementTest(DeviceUtilsTest): ['dumpsys', 'battery', 'set', 'usb', '0'], check_return=True), []), (self.call.device.GetCharging(), False), (self.call.device.RunShellCommand( + ['dumpsys', 'battery', 'set', 'usb', '1'], check_return=True), []), + (self.call.device.RunShellCommand( ['dumpsys', 'battery', 'reset'], check_return=True), []), (self.call.device.GetCharging(), True)): with self.device.BatteryMeasurement(): |