Roll python-adb to 72674a1...

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

 # 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
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 309 matching lines @@
         try:
           self._adb_cmd.Push(cStringIO.StringIO(content), dest, mtime)
           return True
         except usb_exceptions.AdbCommandFailureException:
           break
         except self._ERRORS as e:
           if not self._Reset('(%s, %s): %s', dest, content, e):
             break
     return False
 
-  def Reboot(self):
+  def Reboot(self, wait=True):
     """Reboots the device. Waits for it to be rebooted but not fully
     operational.
 
     This causes the USB device to disapear momentarily and get a new port_path.
     If the phone just booted up, this function will cause the caller to sleep.
 
     The caller will likely want to call self.Root() to switch adbd to root
     context if desired.
 
     Returns True on success.
     """
     if self._adb_cmd:
+      if not wait:
+        return self._Reboot()
+
       # Get previous uptime to ensure the phone actually rebooted.
       previous_uptime = self.GetUptime()
       if not previous_uptime:
         return False
       if previous_uptime <= 30.:
         # Wait for uptime to be high enough. Otherwise we can't know if the
         # device rebooted or not.
         time.sleep(31. - previous_uptime)
         previous_uptime = self.GetUptime()
         if not previous_uptime:
@@ skipping 27 matching lines @@
           # TODO(maruel): Wait for the remount operation to be completed.
           _LOG.info('%s.Remount(): %s', self.port_path, out)
           return True
         except usb_exceptions.AdbCommandFailureException:
           break
         except self._ERRORS as e:
           if not self._Reset('(): %s', e):
             break
     return False
 
+  def ResetHandle(self, new_endpoint=None):
+    """Resets the handle used to communicate to the device.
+
+    For USB connections, it resets the usb device. For TCP connections,
+    it closes and reopens the TCP connection.
+
+    Args:
+      new_endpoint: If a TCP device, this will be used as the new endpoint in
+                    the TCP connection.
+    Returns:
+      True on success.
+    """
+    if self._adb_cmd:
+      self._adb_cmd.Close()
+      self._adb_cmd = None
+    if new_endpoint:
+      self._serial = None
+    self._handle.Reset(new_endpoint=new_endpoint)
+    return self._Connect(False)
+
   def Shell(self, cmd, timeout_ms=None):
     """Runs a command on an Android device while swallowing exceptions.
 
     Traps all kinds of USB errors so callers do not have to handle this.
 
     Returns:
       tuple(stdout, exit_code)
       - stdout is as unicode if it ran, None if an USB error occurred.
       - exit_code is set if ran.
     """
@@ skipping 450 matching lines @@
     self.Close()
     if not self._WaitUntilFound(use_serial=use_serial, timeout=timeout):
       return False
     if not self._OpenHandle():
       return False
     return self._Connect(use_serial=use_serial)
 
   def __repr__(self):
     return '<Device %s %s>' % (
         self.port_path, self.serial if self.is_valid else '(broken)')