Small fixes as found in staging.

appengine/third_party/python-adb/adb/high.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 414 matching lines @@
     # First query the current state and only try to switch if it's different.
     prev = self.PullContent(path)
     if prev:
       prev = prev.strip()
       if prev == governor:
         return True
       if prev not in self.cache.available_governors:
         _LOG.warning(
             '%s.SetCPUScalingGovernor(): Read invalid scaling_governor: %s',
             self.port_path, prev)
+    else:
+      _LOG.warning(
+          '%s.SetCPUScalingGovernor(): Failed to read %s', self.port_path, path)
 
     # This works on Nexus 10 but not on Nexus 5. Need to investigate more. In
     # the meantime, simply try one after the other.
     if not self.PushContent(governor + '\n', path):
+      _LOG.info(
+          '%s.SetCPUScalingGovernor(): Failed to push %s in %s',
+          self.port_path, governor, path)
       # Fallback via shell.
       _, exit_code = self.Shell('echo "%s" > %s' % (governor, path))
       if exit_code != 0:
         _LOG.warning(
             '%s.SetCPUScalingGovernor(): Writing %s failed; was %s',
             self.port_path, governor, prev)
         return False
     # Get it back to confirm.
     newval = self.PullContent(path)
     if not (newval or '').strip() == governor:
@@ skipping 152 matching lines @@
       return None
     return [l.split(':', 1)[1] for l in out.strip().splitlines()]
 
   def InstallAPK(self, destdir, apk):
     """Installs apk to destdir directory."""
     # TODO(maruel): Test.
     # '/data/local/tmp/'
     dest = posixpath.join(destdir, os.path.basename(apk))
     if not self.Push(apk, dest):
       return False
-    return self.Shell('pm install -r %s' % pipes.quote(dest))[1] is 0
+    cmd = 'pm install -r %s' % pipes.quote(dest)
+    out, exit_code = self.Shell(cmd)
+    if not exit_code:
+      return True
+    _LOG.info('%s: %s', cmd, out)
+    return False
 
   def UninstallAPK(self, package):
     """Uninstalls the package."""
-    return self.Shell('pm uninstall %s' % pipes.quote(package))[1] is 0
+    cmd = 'pm uninstall %s' % pipes.quote(package)
+    out, exit_code = self.Shell(cmd)
+    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 WaitForDevice(self, timeout=180):
     """Waits for the device to be responsive.
 
     In practice, waits for the device to have its external storage to be
     mounted.
 
     Returns:
     - uptime as float in second or None.
     """
+    if not self.cache.external_storage_path:
+      return False
     start = time.time()
     while True:
       if (time.time() - start) > timeout:
-        return False
+        break
       if self.Stat(self.cache.external_storage_path)[0] != None:
         return True
       time.sleep(0.1)
+    _LOG.warning('%s.WaitForDevice() failed', self.port_path)
     return False
 
   def WaitUntilFullyBooted(self, timeout=300):
     """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.
     """
     # Wait for the device to respond at all and optionally have lower uptime.
     start = time.time()
     if not self.WaitForDevice(timeout):
       return False
 
     # Wait for the internal sys.boot_completed bit to be set. This is the place
     # where most time is spent.
     while True:
       if (time.time() - start) > timeout:
+        _LOG.warning(
+            '%s.WaitUntilFullyBooted() didn\'t get init.svc.bootanim in time: '
+            '%r',
+            self.port_path, self.GetProp('init.svc.bootanim'))
         return False
-      if self.GetProp('sys.boot_completed') == '1':
+      # sys.boot_completed can't be relyed on. It fires too early or worse can
+      # be completely missing on some kernels (e.g. Manta).
+      if self.GetProp('init.svc.bootanim') == 'stopped':
         break
       time.sleep(0.1)
 
     # Wait for one network to be up and running.
     while not self.GetIPs():
       if (time.time() - start) > timeout:
+        _LOG.warning(
+            '%s.WaitUntilFullyBooted() didn\'t get an IP in time',
+            self.port_path)
         return False
       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 84 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))