Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-06-02 18:21:50 -07:00
committed by Android (Google) Code Review
parent 1076f5ff27 c91c7f92c9
commit 2e543dc188
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/ServiceState.java
View File

@@ -551,7 +551,7 @@ public class ServiceState implements Parcelable {
*
* @hide
*/
public void setCdmaEriText(String longName) {
public void setOperatorAlphaLong(String longName) {
mOperatorAlphaLong = longName;
}

9
telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
View File

@@ -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;

2
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -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;