Roll python-adb to 72674a1...

appengine/third_party/python-adb/adb/contrib/high.py

 # coding=utf-8
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # 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
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 414 matching lines @@
 
   def PullContent(self, *args, **kwargs):
     return self._device.PullContent(*args, **kwargs)
 
   def Push(self, *args, **kwargs):
     return self._device.Push(*args, **kwargs)
 
   def PushContent(self, *args, **kwargs):
     return self._device.PushContent(*args, **kwargs)
 
-  def Reboot(self):
+  def Reboot(self, wait=True):
     """Reboots the phone then Waits for the device to come back.
 
     adbd running on the phone will likely not be in Root(), so the caller should
     call Root() right afterward if desired.
     """
-    if not self._device.Reboot():
+    if not self._device.Reboot(wait=wait):
       return False
-    return self.WaitUntilFullyBooted()
+    return self.WaitUntilFullyBooted() if wait else True
+
+  def Reset(self, new_endpoint=None):
+    self._device.ResetHandle(new_endpoint=new_endpoint)
 
   def Remount(self):
     return self._device.Remount()
 
   def Root(self):
     return self._device.Root()
 
   def Shell(self, cmd, timeout_ms=None):
     """Automatically uses WrappedShell() when necessary."""
     if self._device.IsShellOk(cmd):
@@ skipping 403 matching lines @@
     # Then the slowest part of all.
     while True:
       if (time.time() - start) > timeout:
         _LOG.warning(
             '%s.WaitUntilFullyBooted() didn\'t get Package Manager running in '
             'time',
             self.port_path)
         return False
       # pm can be very slow at times. Use a longer timeout to prevent
       # confusing a long-running command with an interrupted connection.
-      out, _ = self.Shell('pm path', timeout_ms=30000)
+      out, exit_code = self.Shell('pm path', timeout_ms=30000)
       if out == 'Error: no package specified\n':
         # It's up!
         break
 
       # Accepts an empty string too, which has been observed only on Android 4.4
       # (Kitkat) but not on later versions.
-      assert out in (
+      if out not in (
           'Error: Could not access the Package Manager.  Is the system '
           'running?\n',
-          ''), out
+          ''):
+        logging.warning(
+            'Unexpected reply from pm path (%d): %r', exit_code, out)
       time.sleep(0.1)
 
     return True
 
   def PushKeys(self):
     """Pushes all the keys on the file system to the device.
 
     This is necessary when the device just got wiped but still has
     authorization, as soon as it reboots it'd lose the authorization.
 
@@ skipping 85 matching lines @@
     return out
 
   @classmethod
   def _Connect(cls, constructor, **kwargs):
     """Called by either ConnectDevice or Connect."""
     if not kwargs.get('rsa_keys'):
       with _ADB_KEYS_LOCK:
         kwargs['rsa_keys'] = _ADB_KEYS[:]
     device = constructor(**kwargs)
     return HighDevice(device, _InitCache(device))