commit 60a65773a7199f0a6b8f36bba00f11b84f8c0227
author Brian Carlstrom <bdc@google.com> Tue Feb 23 16:39:09 2010 -0800
committer Brian Carlstrom <bdc@google.com> Tue Feb 23 16:39:09 2010 -0800
tree 29d4666f78a7408597256f35478b39ad7a828c72
parent 01961a9d1f152c308b0c372214a1f204b3c0a5cf

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

libcore/tools/runner/java/dalvik/runner/Adb.java

diff --git a/libcore/tools/runner/java/dalvik/runner/Adb.java b/libcore/tools/runner/java/dalvik/runner/Adb.java
index 0ab14ec..c982058 100644
--- a/libcore/tools/runner/java/dalvik/runner/Adb.java
+++ b/libcore/tools/runner/java/dalvik/runner/Adb.java
@@ -81,7 +81,11 @@
         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);