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

Commit dac9376c authored by Jef Oliver's avatar Jef Oliver Committed by Gerrit Code Review
Browse files

Merge "telephony: CdmaServiceStateTracker: Get cdma sub. when ruim ready." into cm-10.1

parents 60a7d2e0 63bfa739

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
    private int mNitzUpdateDiff = SystemProperties.getInt("ro.nitz_update_diff",

            NITZ_UPDATE_DIFF_DEFAULT);



    private boolean mSubscribeOnRuimReady = SystemProperties.getBoolean(

            "ro.cdma.subscribe_on_ruim_ready", false);



    private boolean mCdmaRoaming = false;

    private int mRoamingIndicator;

    private boolean mIsInPrl;
@@ -286,7 +289,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
            // TODO: Consider calling setCurrentPreferredNetworkType as we do in GsmSST.

            // cm.setCurrentPreferredNetworkType();



            if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {

            if (!mSubscribeOnRuimReady && phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {

                // Subscription will be read from SIM I/O

                if (DBG) log("Receive EVENT_RUIM_READY");

                pollState();