am 60a65773: Minor fix for Adb.waitForNonEmptyDirectory so that waiting for /sdcard after reboot works again.

Merge commit '60a65773a7199f0a6b8f36bba00f11b84f8c0227' into dalvik-dev

* commit '60a65773a7199f0a6b8f36bba00f11b84f8c0227':
  Minor fix for Adb.waitForNonEmptyDirectory so that waiting for /sdcard after reboot works again.

1 files changed, 5 insertions, 1 deletions

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