commit cfa7251903fb1ad0f9ab2e46af0515036d285c7d
author nharold <nharold@google.com> Wed May 24 01:36:14 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 01:36:15 2017 +0000
tree 279c5a6227ff446744377c198e7e9ca2d8fadc60
parent b36f8c8ecb904d5cd6a073f09b6f3f17a90b7e63
parent f118cdaa444198ae843bcc3fa154719d7f7e4891

Merge "Update the waitUntilReady/setReady logic to use java blocking"

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
index e944806..df4f0ee 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
@@ -87,6 +87,8 @@
 public abstract class TelephonyTest {
     protected static String TAG;
 
+    private static final int MAX_INIT_WAIT_MS = 30000; // 30 seconds
+
     @Mock
     protected GsmCdmaPhone mPhone;
     @Mock
@@ -225,11 +227,14 @@
     }
 
     protected void waitUntilReady() {
-        while (true) {
-            synchronized (mLock) {
-                if (mReady) {
-                    break;
-                }
+        synchronized (mLock) {
+            try {
+                mLock.wait(MAX_INIT_WAIT_MS);
+            } catch (InterruptedException ie) {
+            }
+
+            if (!mReady) {
+                fail("Telephony tests failed to initialize");
             }
         }
     }
@@ -237,6 +242,7 @@
     protected void setReady(boolean ready) {
         synchronized (mLock) {
             mReady = ready;
+            mLock.notifyAll();
         }
     }