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

Commit 982a6e91 authored Apr 28, 2015 by Erica Chang Committed by Howard Harte Apr 28, 2015

telephony: check force_plmn_lookup for SPN

Change-Id: Iaa13980c32f8d1d93435b93c544d12f5c4c34506
(cherry picked from commit 3e0ad98e)

parent 85d68063

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -480,9 +480,11 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		}

		if (mUiccApplcation != null && mUiccApplcation.getState() == AppState.APPSTATE_READY &&
		mIccRecords != null) {
		mIccRecords != null &&
		!SystemProperties.getBoolean("ro.cdma.force_plmn_lookup", false)) {
		// 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.
		// If force plmn lookup, keep the lookup value instead
		boolean showSpn =
		((RuimRecords)mIccRecords).getCsimSpnDisplayCondition();
		int iconIndex = mSS.getCdmaEriIconIndex();

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1026,9 +1026,11 @@ public final class RuimRecords extends IccRecords {
		rule = SPN_RULE_SHOW_PLMN;
		} else if (isOnMatchingPlmn(plmnNumeric)) {
		// on home network
		if (mCsimSpnDisplayCondition && !TextUtils.isEmpty(getServiceProviderName())) {
		if (mCsimSpnDisplayCondition && !TextUtils.isEmpty(getServiceProviderName())
		&& (!SystemProperties.getBoolean("ro.cdma.force_plmn_lookup", false))) {
		// check CSIM SPN Display Condition (applicable on home network),
		// but only if SPN was found on this RUIM
		// if force plmn lookup then plmn should be used
		rule = SPN_RULE_SHOW_SPN;
		} else {
		// CSIM SPN Display does not require a SPN display, or SPN not found on RUIM,