python-adb: Optionally skip sd_card checking when booting up.

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 813 matching lines @@
     if not exit_code:
       return True
     _LOG.info('%s: %s', cmd, out)
     return False
 
   def GetApplicationPath(self, package):
     # TODO(maruel): Test.
     out, _ = self.Shell('pm path %s' % pipes.quote(package))
     return out.strip().split(':', 1)[1] if out else out
 
-  def IsFullyBooted(self):
+  def IsFullyBooted(self, skip_sd_card=False):
     """Checks whether the device is fully booted.
 
+    Args:
+      - skip_sd_card: Skips checking if the external storage is ready if True.
+                      Some devices lack an internal sd card and permanently
+                      fail this check.
     Returns:
       tuple(booted, status)
       - booted: True if device is fully booted, false otherwise.
       - status: If not booted, string describing why.
     """
-    if not self.cache.external_storage_path:
-      return False, 'external storage not ready'
-    if self.Stat(self.cache.external_storage_path)[0] is None:
-      return False, 'external storage not ready'
+    if not skip_sd_card:
+      if not self.cache.external_storage_path:
+        return False, 'external storage not ready'
+      if self.Stat(self.cache.external_storage_path)[0] is None:
+        return False, 'external storage not ready'
 
     # Check if the boot animation has stopped.
     prop = self.GetProp('init.svc.bootanim')
     if prop is None:
       return False, 'could not get init.svc.bootanim property'
     elif prop != 'stopped':
       return False, 'boot animation still running'
 
     # pm can be very slow at times. Use a longer timeout to prevent
     # confusing a long-running command with an interrupted connection.
     out, exit_code = self.Shell('pm path', timeout_ms=30000)
     if out != 'Error: no package specified\n':
       # Accepts an empty string too, which has been observed only on Android 4.4
       # (Kitkat) but not on later versions.
       if out not in (
           'Error: Could not access the Package Manager.  Is the system '
           'running?\n',
           ''):
         logging.warning(
             'Unexpected reply from pm path (%d): %r', exit_code, out)
       return False, 'pm not ready'
 
     # All checks passed.
     return True, None
 
-  def WaitUntilFullyBooted(self, timeout=300):
+  def WaitUntilFullyBooted(self, timeout=300, **kwargs):
     """Waits for the device to be fully started up with network connectivity.
 
     Arguments:
     - timeout: minimum amount of time to wait for for the device to come up
           online. It may extend to up to lock_timeout_ms more.
     """
     start = time.time()
     while True:
-      is_booted, status = self.IsFullyBooted()
+      is_booted, status = self.IsFullyBooted(**kwargs)
       if is_booted:
         return True
       if (time.time() - start) > timeout:
         _LOG.warning(
             '%s.WaitUntilFullyBooted() timed out due to %s',
             self.port_path, status)
         return False
       time.sleep(1)
 
   def PushKeys(self):
@@ skipping 90 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))