commit 4ed69e0c716645ea9217db90bb7a2617d51d5655
author Victor Hsieh <victorhsieh@chromium.org> Tue Jun 20 13:09:40 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Jun 23 18:31:23 2017 -0700
tree faf03ccd5ad150f24083c21a0570d32dbffa98f7
parent 5e521523a6b7c5890f1c0a53ebdec80b6af1973d

Make wait_for_adb_ready wait for data mounted

Since adbd is started initially before /data is mounted,
we need to wait until /data is mounted before setting up
the authentication key.

TEST=try bvt-cq
BUG=b:62704065

Change-Id: Ic70f5228df1c8475a178209bcd42d8559b1c0969
Reviewed-on: https://chromium-review.googlesource.com/541735
Commit-Ready: Victor Hsieh <victorhsieh@chromium.org>
Tested-by: Victor Hsieh <victorhsieh@chromium.org>
Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>

client/common_lib/cros/arc.py

diff --git a/client/common_lib/cros/arc.py b/client/common_lib/cros/arc.py
index 1fb2f0f..00e4182 100644
--- a/client/common_lib/cros/arc.py
+++ b/client/common_lib/cros/arc.py
@@ -27,6 +27,7 @@
 _PROCESS_CHECK_INTERVAL_SECONDS = 1
 _WAIT_FOR_ADB_READY = 60
 _WAIT_FOR_ANDROID_PROCESS_SECONDS = 60
+_WAIT_FOR_DATA_MOUNTED_SECONDS = 60
 _VAR_LOGCAT_PATH = '/var/log/logcat'
 
 
@@ -67,11 +68,39 @@
     return output.strip() == 'device'
 
 
+def is_partial_boot_enabled():
+    """Return true if partial boot is enabled.
+
+    When partial boot is enabled, Android is started at login screen without
+    any persistent state (e.g. /data is not mounted).
+    """
+    return _android_shell('getprop ro.boot.partial_boot') == '1'
+
+
+def _is_android_data_mounted():
+    """Return true if Android's /data is mounted with partial boot enabled."""
+    return _android_shell('getprop ro.data_mounted') == '1'
+
+
+def _wait_for_data_mounted(timeout=_WAIT_FOR_DATA_MOUNTED_SECONDS):
+    utils.poll_for_condition(
+            condition=_is_android_data_mounted,
+            desc='Wait for /data mounted',
+            timeout=timeout,
+            sleep_interval=_PROCESS_CHECK_INTERVAL_SECONDS)
+
+
 def wait_for_adb_ready(timeout=_WAIT_FOR_ADB_READY):
     """Wait for the ADB client to connect to the ARC container.
 
     @param timeout: Timeout in seconds.
     """
+    # When partial boot is enabled, although adbd is started at login screen,
+    # we still need /data to be mounted to set up key-based authentication.
+    # /data should be mounted once the user has logged in.
+    if is_partial_boot_enabled():
+        _wait_for_data_mounted()
+
     setup_adb_host()
     if is_adb_connected():
       return