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

Commit 5e31d9b0 authored by Jack Yu's avatar Jack Yu Committed by Android Git Automerger
Browse files

am 4138d4a9: Merge "Fixed the incorrect operator name displayed when roaming." into mnc-dev 

* commit '4138d4a9':
  Fixed the incorrect operator name displayed when roaming.
parents 08bf39fd 4138d4a9

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

+4 −2
Original line number Diff line number Diff line
@@ -460,9 +460,11 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
            }



            if (mUiccApplcation != null && mUiccApplcation.getState() == AppState.APPSTATE_READY &&

                    mIccRecords != null && (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE)) {

                    mIccRecords != null && (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE)

                    && mSS.getRilVoiceRadioTechnology() != ServiceState.RIL_RADIO_TECHNOLOGY_LTE) {

                // SIM is found on the device. If ERI roaming is OFF, and SID/NID matches

                // one configured in SIM, use operator name from CSIM record.

                // one configured in SIM, use operator name from CSIM record. Note that ERI, SID,

                // and NID are CDMA only, not applicable to LTE.

                boolean showSpn =

                    ((RuimRecords)mIccRecords).getCsimSpnDisplayCondition();

                int iconIndex = mSS.getCdmaEriIconIndex();