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

Commit 6c5a5a70 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed flaky unit tests" am: 2b007404 

am: 499a012d

Change-Id: I0b676b27f94cd67e7de1ae3365f8b9b25310404f
parents ad1aab99 499a012d

src/java/com/android/internal/telephony/ServiceStateTracker.java

+7 −4
Original line number Diff line number Diff line
@@ -3721,11 +3721,14 @@ public class ServiceStateTracker extends Handler { 
        }



        // if there is no SIM present, do not poll signal strength

        if (UiccController.getInstance() != null) {

            UiccCard uiccCard = UiccController.getInstance().getUiccCard(getPhoneId());

            if (uiccCard == null || uiccCard.getCardState() == CardState.CARDSTATE_ABSENT) {

                log("Not polling signal strength due to absence of SIM");

                return;

            }

        }





        Message msg;

src/java/com/android/internal/telephony/uicc/UiccController.java

+1 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.telephony.Rlog; 
import android.telephony.TelephonyManager;

import android.util.LocalLog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.IccCardConstants;
@@ -198,8 +197,7 @@ public class UiccController extends Handler { 
    public static UiccController getInstance() {

        synchronized (mLock) {

            if (mInstance == null) {

                throw new RuntimeException(

                        "UiccController.getInstance can't be called before make()");

                Rlog.e(LOG_TAG, "UiccController.getInstance can't be called before make()");

            }

            return mInstance;

        }