Merge "Set provider name in airplane mode." into jb-dev (15feb688) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -343,10 +343,16 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
	// new ERI text		// new ERI text
	if (ss.getState() == ServiceState.STATE_IN_SERVICE) {		if (ss.getState() == ServiceState.STATE_IN_SERVICE) {
	eriText = phone.getCdmaEriText();		eriText = phone.getCdmaEriText();
			} else if (ss.getState() == ServiceState.STATE_POWER_OFF) {
			eriText = phone.mIccRecords.getServiceProviderName();
			if (TextUtils.isEmpty(eriText)) {
			// Sets operator alpha property by retrieving from
			// build-time system property
			eriText = SystemProperties.get("ro.cdma.home.operator.alpha");
			}
	} else {		} else {
	// Note that ServiceState.STATE_OUT_OF_SERVICE is valid used		// Note that ServiceState.STATE_OUT_OF_SERVICE is valid used
	// for		// for mRegistrationState 0,2,3 and 4
	// mRegistrationState 0,2,3 and 4
	eriText = phone.getContext()		eriText = phone.getContext()
	.getText(com.android.internal.R.string.roamingTextSearching).toString();		.getText(com.android.internal.R.string.roamingTextSearching).toString();
	}		}