Index: build/android/buildbot/bb_device_status_check.py |
diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py |
index 94c741fe13d739da9e949e28dd0125b290dc889e..884af74fc21cc1405c86b48ec5dfa391d1eeb17f 100755 |
--- a/build/android/buildbot/bb_device_status_check.py |
+++ b/build/android/buildbot/bb_device_status_check.py |
@@ -30,6 +30,7 @@ from pylib import android_commands |
from pylib import constants |
from pylib.cmd_helper import GetCmdOutput |
from pylib.device import device_blacklist |
+from pylib.device import device_errors |
from pylib.device import device_utils |
def DeviceInfo(serial, options): |
@@ -89,7 +90,11 @@ def DeviceInfo(serial, options): |
# Turn off devices with low battery. |
if battery_level < 15: |
- device_adb.old_interface.EnableAdbRoot() |
+ try: |
+ device_adb.EnableRoot() |
+ except device_errors.CommandFailedError: |
+ # Attempt shutdown anyway. |
+ pass |
device_adb.old_interface.Shutdown() |
full_report = '\n'.join(report) |
return device_type, device_build, battery_level, full_report, errors, True |