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

Commit b48abe00 authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

TelephonyTest#waitUntilReady only blocks if mReady is false. 

TelephonyTest#waitUntilReady now always waits. But there's a
chance that before it starts, mReady is set to true. In that case,
it will wait for 30 seconds blindly. Making the change so that
it only waits if mReady is false.

Bug: 113305153
Test: unittest
Change-Id: I1072bc86c135769a68d3d10228bed8b050005084
parent 181cff5e

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

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




    protected void waitUntilReady() {

    protected void waitUntilReady() {

        synchronized (mLock) {

        synchronized (mLock) {

            if (!mReady) {

                try {

                try {

                    mLock.wait(MAX_INIT_WAIT_MS);

                    mLock.wait(MAX_INIT_WAIT_MS);

                } catch (InterruptedException ie) {

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

                }

            }

            }

        }

        }

    }





    protected void setReady(boolean ready) {

    protected void setReady(boolean ready) {

        synchronized (mLock) {

        synchronized (mLock) {