Merge "Use operator name from CSIM record only when voiceRegState is IN_SERVICE." into lmp-mr1-dev (13f5f13d) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -413,7 +413,8 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		boolean hasBrandOverride = mUiccController.getUiccCard() == null ? false :
		(mUiccController.getUiccCard().getOperatorBrandOverride() != null);
		if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded())) {
		String eriText;
		// Only when CDMA is in service, ERI will take effect
		String eriText = mSS.getOperatorAlphaLong();
		// Now the CDMAPhone sees the new ServiceState so it can get the
		// new ERI text
		if (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {
		@@ -425,7 +426,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		// build-time system property
		eriText = SystemProperties.get("ro.cdma.home.operator.alpha");
		}
		} else {
		} else if (mSS.getDataRegState() != ServiceState.STATE_IN_SERVICE) {
		// Note that ServiceState.STATE_OUT_OF_SERVICE is valid used
		// for mRegistrationState 0,2,3 and 4
		eriText = mPhone.getContext()
		@@ -435,7 +436,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		}

		if (mUiccApplcation != null && mUiccApplcation.getState() == AppState.APPSTATE_READY &&
		mIccRecords != null) {
		mIccRecords != null && (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE)) {
		// 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.
		boolean showSpn =