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

Commit e4f8aa03 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Fixed flaky unit tests""

parents 51856bff ba268e7d

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

+4 −7
Original line number Diff line number Diff line
@@ -3721,14 +3721,11 @@ 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

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 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;
@@ -197,7 +198,8 @@ public class UiccController extends Handler { 
    public static UiccController getInstance() {

        synchronized (mLock) {

            if (mInstance == null) {

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

                throw new RuntimeException(

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

            }

            return mInstance;

        }