Allow provision_devices to work on the L-release preview.

third_party/android_testrunner/adb_interface.py

 #!/usr/bin/python2.4
 #
 #
 # Copyright 2008, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 300 matching lines @@
     """Waits for targeted device's package manager to be up.
 
     Args:
       wait_time: time in seconds to wait
 
     Raises:
       WaitForResponseTimedOutError if wait_time elapses and pm still does not
       respond.
     """
     logger.Log("Waiting for device package manager...")
-    self.SendCommand("wait-for-device")
+    self.SendCommand("wait-for-device", timeout_time=wait_time, retry_count=0)
     # Now the device is there, but may not be running.
     # Query the package manager with a basic command
     try:
       self._WaitForShellCommandContents("pm path android", "package:",
                                         wait_time)
     except errors.WaitForResponseTimedOutError:
       raise errors.WaitForResponseTimedOutError(
           "Package manager did not respond after %s seconds" % wait_time)
 
   def WaitForInstrumentation(self, package_name, runner_name, wait_time=120):
@@ skipping 70 matching lines @@
       WaitForResponseTimedOutError: If wait_time elapses and the command has not
           returned an output containing expected yet.
     """
     # Query the device with the command
     success = False
     attempts = 0
     wait_period = 5
     while not success and (attempts*wait_period) < wait_time:
       # assume the command will always contain expected in the success case
       try:
-        output = self.SendShellCommand(command, retry_count=1)
+        output = self.SendShellCommand(command, retry_count=1,
+                                       timeout_time=wait_time)
         if ((not invert and expected in output)
             or (invert and expected not in output)):
           success = True
       except errors.AbortError, e:
         if raise_abort:
           raise
         # ignore otherwise
 
       if not success:
         time.sleep(wait_period)
@@ skipping 81 matching lines @@
       # press the MENU key, this will disable key guard if runtime is started
       # with ro.monkey set to 1
       self.SendShellCommand("input keyevent 82", retry_count=retry_count)
     else:
       self.WaitForDevicePm()
     return output
 
   def GetSerialNumber(self):
     """Returns the serial number of the targeted device."""
     return self.SendCommand("get-serialno").strip()