Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3756a17a authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "TelephonyTest#waitUntilReady only blocks if mReady is false." am: 372e763f 

am: f74563c1

Change-Id: I0ce82a298270c88814a67961fc897cf87a3b8669
parents 2494b0a7 f74563c1

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

+8 −6
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ public abstract class TelephonyTest { 


    protected void waitUntilReady() {

        synchronized (mLock) {

            if (!mReady) {

                try {

                    mLock.wait(MAX_INIT_WAIT_MS);

                } catch (InterruptedException ie) {
@@ -264,6 +265,7 @@ public abstract class TelephonyTest { 
                }

            }

        }

    }



    protected void setReady(boolean ready) {

        synchronized (mLock) {