| commit | ed1a9022a19a9003931ce47ff7a0a0b5564255a5 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Jun 03 15:55:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 03 15:55:25 2011 -0700 |
| tree | 0c44df4a59c94400bf2866fa2f41382212f5cce1 | |
| parent | 3144ca294b6e877d0b0d937cc4a863bdf0adaa0f [diff] | |
| parent | 147510145f7b619f86a71065f2d62f444aee7f3d [diff] |
am 14751014: am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE * commit '147510145f7b619f86a71065f2d62f444aee7f3d': CdmaLte: Use SPN from SIM card if SIM card is presend
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 @@ * * @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 @@ 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 @@ eriText = phone.getContext().getText( com.android.internal.R.string.roamingTextSearching).toString(); } - ss.setCdmaEriText(eriText); + ss.setOperatorAlphaLong(eriText); } String operatorNumeric;