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

Commit 42d4645b authored by Shareef Ali's avatar Shareef Ali Committed by Gerrit Code Review
Browse files

Merge "Telephony: Allow ruim to fetch in CDMA LTE mode" into cm-11.0

parents a687ce11 183e1922

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.internal.telephony.TelephonyIntents; 
import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState;

import com.android.internal.telephony.uicc.IccCardStatus.CardState;

import com.android.internal.telephony.uicc.IccCardStatus.CardState;
@@ -167,7 +168,11 @@ public class IccCardProxy extends Handler implements IccCard { 




        if (mCurrentAppType == UiccController.APP_FAM_3GPP2) {

        if (mCurrentAppType == UiccController.APP_FAM_3GPP2) {

            int newSubscriptionSource = mCdmaSSM.getCdmaSubscriptionSource();

            int newSubscriptionSource = mCdmaSSM.getCdmaSubscriptionSource();

            if (newSubscriptionSource == CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_RUIM) {

            // Allow RUIM to fetch in CDMA LTE mode if NV LTE mode.

            // Fixes cases where iccid could be unknown on some CDMA NV devices.

            if (newSubscriptionSource == CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_RUIM

                    || PhoneFactory.getDefaultPhone().getLteOnCdmaMode()

                       == PhoneConstants.LTE_ON_CDMA_TRUE) {

                // Set this as the Active record.

                // Set this as the Active record.

                log("Setting Ruim Record as active");

                log("Setting Ruim Record as active");

                mIccRecords.recordsRequired();

                mIccRecords.recordsRequired();