commit a210ccfab7386478809427fb4f1b2cc12a1490d4
author Makoto Onuki <omakoto@google.com> Wed Jul 27 14:08:48 2016 -0700
committer Makoto Onuki <omakoto@google.com> Wed Jul 27 14:08:48 2016 -0700
tree 4e66c7a05f5f9ea213c51c0e5eb2e39467a3eedd
parent 4898bf964d4c1e562875cd191e5f7c66448c4572

Fix timeout in a test utility method

Bug 29612099

Change-Id: Ic09a280de33dd58569f5b57242f27ece6d74c120

services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java

diff --git a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
index e5c91aa..78f95c4 100644
--- a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
+++ b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
@@ -1055,6 +1055,9 @@
     public static void retryUntil(BooleanSupplier checker, String message) {
         final long timeOut = System.currentTimeMillis() + 30 * 1000; // wait for 30 seconds.
         while (!checker.getAsBoolean()) {
+            if (System.currentTimeMillis() > timeOut) {
+                break;
+            }
             try {
                 Thread.sleep(200);
             } catch (InterruptedException ignore) {