commit 550704434c1e3c81ccd6e9c9e06bbee0f202ca07
author Brett Chabot <brettchabot@android.com> Fri Oct 22 15:13:40 2010 -0700
committer Brett Chabot <brettchabot@android.com> Fri Oct 22 15:13:40 2010 -0700
tree 64b4f3a66d8f301611d191ba4bfb999023db7bf8
parent 92558add8bfc9ff824b071c1641460219b83d511

Fix negative wait for bootloader time.

Bug 3110915

Change-Id: I4b46a14ecfc02d8289465ff5ed12815915291d0e

src/com/android/tradefed/device/DeviceStateMonitor.java

diff --git a/src/com/android/tradefed/device/DeviceStateMonitor.java b/src/com/android/tradefed/device/DeviceStateMonitor.java
index e53b309..a05e1ea 100644
--- a/src/com/android/tradefed/device/DeviceStateMonitor.java
+++ b/src/com/android/tradefed/device/DeviceStateMonitor.java
@@ -286,7 +286,12 @@
         long elapsedTime = System.currentTimeMillis() - startTime;
         IFastbootListener listener = new StubFastbootListener();
         mMgr.addFastbootListener(listener);
-        boolean result =  waitForDeviceState(TestDeviceState.FASTBOOT, time - elapsedTime);
+        long waitTime = time - elapsedTime;
+        if (waitTime < 0) {
+            // wait at least 200ms
+            waitTime = 200;
+        }
+        boolean result =  waitForDeviceState(TestDeviceState.FASTBOOT, waitTime);
         mMgr.removeFastbootListener(listener);
         return result;
     }