diff options
3 files changed, 10 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index ba05837..2aa6d1d 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -551,7 +551,7 @@ public class ServiceState implements Parcelable { * * @hide */ - public void setCdmaEriText(String longName) { + public void setOperatorAlphaLong(String longName) { mOperatorAlphaLong = longName; } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index e593bd0..067139e 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java @@ -351,7 +351,14 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { eriText = phone.getContext() .getText(com.android.internal.R.string.roamingTextSearching).toString(); } - ss.setCdmaEriText(eriText); + ss.setOperatorAlphaLong(eriText); + } + if (cm.getSimState().isSIMReady()) { + // SIM is found on the device. Read the operator name from the card. + ss.setOperatorAlphaLong(phone.mIccRecords.getServiceProviderName()); + + // If SIM card is present, Eri will not be used. Turn it off + ss.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF); } String operatorNumeric; diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 56b335e..54bc58a 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -1017,7 +1017,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { eriText = phone.getContext().getText( com.android.internal.R.string.roamingTextSearching).toString(); } - ss.setCdmaEriText(eriText); + ss.setOperatorAlphaLong(eriText); } String operatorNumeric; |