From a210ccfab7386478809427fb4f1b2cc12a1490d4 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Wed, 27 Jul 2016 14:08:48 -0700
Subject: [PATCH] Fix timeout in a test utility method

Bug 29612099

Change-Id: Ic09a280de33dd58569f5b57242f27ece6d74c120
---
 .../pm/shortcutmanagertest/ShortcutManagerTestUtils.java       | 3 +++
 1 file changed, 3 insertions(+)

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 e5c91aaacb5db..78f95c4d217e8 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 class ShortcutManagerTestUtils {
     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) {