Minor fix for Adb.waitForNonEmptyDirectory so that waiting for /sdcard after reboot...

diff --git a/libcore/tools/runner/java/dalvik/runner/Adb.java b/libcore/tools/runner/java/dalvik/runner/Adb.java
index 0ab14ec..c982058 100644 (file)
--- a/libcore/tools/runner/java/dalvik/runner/Adb.java
+++ b/libcore/tools/runner/java/dalvik/runner/Adb.java
@@ -81,7 +81,11 @@ final class Adb {
         while (true) {
             final long remainingSeconds = ((deadline - System.currentTimeMillis())
                                            / millisPerSecond);
-            Command command = new Command("adb", "shell", "ls", path.getPath());
+            String pathArgument = path.getPath();
+            if (!file) {
+                pathArgument += "/";
+            }
+            Command command = new Command("adb", "shell", "ls", pathArgument);
             List<String> output;
             try {
                 output = command.executeWithTimeout(remainingSeconds);