[Android] Add a hard reset to device_status_check.

build/android/buildbot/bb_device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A class to keep track of devices across builds and report state."""
 
 import argparse
 import json
@@ skipping 227 matching lines @@
     except (IOError, device_errors.DeviceUnreachableError):
       logging.exception('Unable to reset USB for %s.', serial)
       if blacklist:
         blacklist.Extend([serial])
 
   def blacklisting_recovery(device):
     if _IsBlacklisted(device.adb.GetDeviceSerial(), blacklist):
       logging.debug('%s is blacklisted, skipping recovery.', str(device))
       return
 
-    if device in should_reboot_device:
+    if str(device) in should_reboot_device:
       try:
-        device.WaitUntilFullyBooted()
+        device.WaitUntilFullyBooted(retries=0)
         return
       except (device_errors.CommandTimeoutError,
               device_errors.CommandFailedError):
         logging.exception('Failure while waiting for %s. '
                           'Attempting to recover.', str(device))
 
       try:
-        device.Reboot()
-        device.WaitUntilFullyBooted()
+        try:
+          device.Reboot(block=False, timeout=5, retries=0)
+        except device_errors.CommandTimeoutError:
+          logging.warning('Timed out while attempting to reboot %s normally.'
+                          'Attempting alternative reboot.', str(device))
+          # The device drops offline before we can grab the exit code, so
+          # we don't check for status.
+          device.adb.Root()
+          device.adb.Shell('echo b > /proc/sysrq-trigger', expect_status=None,
+                           timeout=5, retries=0)
+      except device_errors.CommandFailedError:
+        logging.exception('Failed to reboot %s.', str(device))
+        if blacklist:
+          blacklist.Extend([device.adb.GetDeviceSerial()])
+      except device_errors.CommandTimeoutError:
+        logging.exception('Timed out while rebooting %s.', str(device))
+        if blacklist:
+          blacklist.Extend([device.adb.GetDeviceSerial()])
+
+      try:
+        device.WaitUntilFullyBooted(retries=0)
       except device_errors.CommandFailedError:
         logging.exception('Failure while waiting for %s.', str(device))
         if blacklist:
           blacklist.Extend([device.adb.GetDeviceSerial()])
       except device_errors.CommandTimeoutError:
-        logging.exception('Timed out while waiting for %s. ', str(device))
+        logging.exception('Timed out while waiting for %s.', str(device))
         if blacklist:
           blacklist.Extend([device.adb.GetDeviceSerial()])
 
   device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_recovery)
 
 
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--out-dir',
                       help='Directory where the device path is stored',
@@ skipping 86 matching lines @@
   live_devices = [status['serial'] for status in statuses
                   if (status['adb_status'] == 'device'
                       and not _IsBlacklisted(status['serial'], blacklist))]
 
   # If all devices failed, or if there are no devices, it's an infra error.
   return 0 if live_devices else constants.INFRA_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())