Android: makes "RestartAdbdOnDevice" more robust.

build/android/pylib/android_commands.py

 # Copyright (c) 2012 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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 447 matching lines @@
         reboots_left -= 1
 
   def MakeSystemFolderWritable(self):
     """Remounts the /system folder rw."""
     out = self._adb.SendCommand('remount')
     if out.strip() != 'remount succeeded':
       raise errors.MsgException('Remount failed: %s' % out)
 
   def RestartAdbdOnDevice(self):
     logging.info('Killing adbd on the device...')
-    adb_pids = self.KillAll('adbd', signal=signal.SIGTERM, with_su=True)
-    assert adb_pids, 'Unable to obtain adbd pid'
-    logging.info('Waiting for device to settle...')
-    self._adb.SendCommand('wait-for-device')
+    adb_pids = self.ExtractPid('adbd')
+    if not adb_pids:
+      raise errors.MsgException('Unable to obtain adbd pid')
+    try:
+      self.KillAll('adbd', signal=signal.SIGTERM, with_su=True)
+      logging.info('Waiting for device to settle...')
+      self._adb.SendCommand('wait-for-device')
+      new_adb_pids = self.ExtractPid('adbd')
+      if new_adb_pids == adb_pids:
+        logging.error('adbd on the device may not have been restarted.')
+    except Exception as e:
+      logging.error('Exception when trying to kill adbd on the device [%s]', e)
 
   def RestartAdbServer(self):
     """Restart the adb server."""
     ret = self.KillAdbServer()
     if ret != 0:
       raise errors.MsgException('KillAdbServer: %d' % ret)
 
     ret = self.StartAdbServer()
     if ret != 0:
       raise errors.MsgException('StartAdbServer: %d' % ret)
@@ skipping 1221 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()