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

Commit 84e47512 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only set the vonr setting when sim state loaded" into udc-qpr-dev am: 0f9f50c8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/24816916



Change-Id: Idc65afc18f4181461ce72d7e332993166c339f70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16c0a6c9 0f9f50c8

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

+7 −2
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ public class GsmCdmaPhone extends Phone { 
    private String mImeiSv;

    private String mVmNumber;

    private int mImeiType = IMEI_TYPE_UNKNOWN;

    private int mSimState = TelephonyManager.SIM_STATE_UNKNOWN;



    @VisibleForTesting

    public CellBroadcastConfigTracker mCellBroadcastConfigTracker =
@@ -426,9 +427,9 @@ public class GsmCdmaPhone extends Phone { 
                if (mPhoneId == intent.getIntExtra(

                        SubscriptionManager.EXTRA_SLOT_INDEX,

                        SubscriptionManager.INVALID_SIM_SLOT_INDEX)) {

                    int simState = intent.getIntExtra(TelephonyManager.EXTRA_SIM_STATE,

                    mSimState = intent.getIntExtra(TelephonyManager.EXTRA_SIM_STATE,

                            TelephonyManager.SIM_STATE_UNKNOWN);

                    if (simState == TelephonyManager.SIM_STATE_LOADED

                    if (mSimState == TelephonyManager.SIM_STATE_LOADED

                            && currentSlotSubIdChanged()) {

                        setNetworkSelectionModeAutomatic(null);

                    }
@@ -5025,6 +5026,10 @@ public class GsmCdmaPhone extends Phone { 
            return;

        }



        if (mSimState != TelephonyManager.SIM_STATE_LOADED) {

            return;

        }



        if (config == null) {

            loge("didn't get the vonr_enabled_bool from the carrier config.");

            return;