[Android] Fix low-battery blacklisting in 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 50 matching lines @@
     battery = battery_utils.BatteryUtils(device)
     battery_info = battery.GetBatteryInfo(timeout=5)
     battery_level = int(battery_info.get('level', 100))
 
     if battery_level < 15:
       logging.error('Critically low battery level (%d)', battery_level)
       battery = battery_utils.BatteryUtils(device)
       if not battery.GetCharging():
         battery.SetCharging(True)
       if blacklist:
-        blacklist.Extend([device.GetDeviceSerial()])
+        blacklist.Extend([device.adb.GetDeviceSerial()])
 
   except device_errors.CommandFailedError:
     logging.exception('Failed to get battery information for %s',
                       str(device))
 
   return battery_info
 
 
 def _IMEISlice(device):
   imei_slice = ''
@@ skipping 166 matching lines @@
               device_errors.CommandFailedError):
         logging.exception('Failure while waiting for %s. '
                           'Attempting to recover.', str(device))
 
       try:
         device.Reboot()
         device.WaitUntilFullyBooted()
       except device_errors.CommandFailedError:
         logging.exception('Failure while waiting for %s.', str(device))
         if blacklist:
-          blacklist.Extend([str(device)])
+          blacklist.Extend([device.adb.GetDeviceSerial()])
       except device_errors.CommandTimeoutError:
         logging.exception('Timed out while waiting for %s. ', str(device))
         if blacklist:
-          blacklist.Extend([str(device)])
+          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',
                       default=os.path.join(constants.DIR_SOURCE_ROOT, 'out'))
   parser.add_argument('--restart-usb', action='store_true',
@@ skipping 86 matching lines @@
   live_devices = [status['serial'] for status in statuses
                   if (status['adb_status'] == 'device'
                       and status['serial'] not in blacklist.Read())]
 
   # 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())