Android: makes "RestartAdbdOnDevice" more robust.

build/android/pylib/android_commands.py

Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index 6f9b99cc2405f9eab6760fe5d71d4fa5c5a9196c..526b38d2bef1ce9806ddbc9f134e9e1d8cb56f14 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -465,8 +465,11 @@ class AndroidCommands(object):
 
   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'
+    try:
+      adb_pids = self.KillAll('adbd', signal=signal.SIGTERM, with_su=True)
+      assert adb_pids, 'Unable to obtain adbd pid'

[tonyg, 2013/11/27 15:25:55]

heh heh, catching your own assertion is kind of funny.

How about:

logging.info('Killing adbd on the device...')
try:
  if self.KillAll('adbd', signal=signal.SIGTERM, with_su=True):
    logging.info('Waiting for device to settle...')
    self._adb.SendCommand('wait-for-device')
  else:
    logging.error('Failed to kill adbd on the device')
except:
  logging.error('Exception when trying to kill adbd on the device [%s]', e)

[bulach, 2013/11/27 16:17:59]

ha! :) good point.. made it a bit clear now.

+    except Except as e:
+      logging.error('Exception when trying to kill adbd on the device [%s]', e)
     logging.info('Waiting for device to settle...')
     self._adb.SendCommand('wait-for-device')