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

am 89799e72: Fix incorrect ERI banner format

Browse Source 
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
  Fix incorrect ERI banner format
This commit is contained in:
Kazuhiro Ondo
2011-07-10 17:21:52 -07:00
committed by Android Git Automerger
parent 99cd66711b 89799e72ee
commit a9e00a4ac8
1 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
CDMALTEPhone mCdmaLtePhone; CDMALTEPhone mCdmaLtePhone;
private ServiceState mLteSS; // The last LTE state from Voice Registration private ServiceState mLteSS; // The last LTE state from Voice Registration
private String mCurrentSpn = null;
public CdmaLteServiceStateTracker(CDMALTEPhone phone) { public CdmaLteServiceStateTracker(CDMALTEPhone phone) {
super(phone); super(phone);
@@ -345,6 +344,18 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
ss.setOperatorAlphaLong(eriText); ss.setOperatorAlphaLong(eriText);
} }
if (cm.getSimState().isSIMReady()) {
// SIM is found on the device. If ERI roaming is OFF, use operator name
// from CSIM record.
boolean showSpn =
((CdmaLteUiccRecords)phone.mIccRecords).getCsimSpnDisplayCondition();
int iconIndex = ss.getCdmaEriIconIndex();
if (showSpn && (iconIndex == EriInfo.ROAMING_INDICATOR_OFF)) {
ss.setOperatorAlphaLong(phone.mIccRecords.getServiceProviderName());
}
}
String operatorNumeric; String operatorNumeric;
phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ALPHA, phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ALPHA,
@@ -467,43 +478,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
return provisioningState; return provisioningState;
} }
@Override
protected void updateSpnDisplay() {
// mOperatorAlphaLong contains the ERI text
String plmn = ss.getOperatorAlphaLong();
boolean showSpn = false;
String spn = null;
if (cm.getSimState().isSIMReady()) {
// SIM is found on the device. Read the operator name from the card.
showSpn = ((CdmaLteUiccRecords)phone.mIccRecords).getCsimSpnDisplayCondition();
spn = phone.mIccRecords.getServiceProviderName();
// double check we are not printing identicall test
if (TextUtils.equals(plmn, spn)) showSpn = false;
}
if (!TextUtils.equals(plmn, mCurPlmn) ||
!TextUtils.equals(spn, mCurrentSpn)) {
boolean showPlmn = plmn != null;
if (DBG) {
log(String.format("updateSpnDisplay: changed sending intent" +
" showPlmn='%b' plmn='%s' showSpn='%b' spn='%s'",
showPlmn, plmn, showSpn, spn));
}
Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION);
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
intent.putExtra(Intents.EXTRA_SHOW_SPN, showSpn);
intent.putExtra(Intents.EXTRA_SPN, spn);
intent.putExtra(Intents.EXTRA_SHOW_PLMN, showPlmn);
intent.putExtra(Intents.EXTRA_PLMN, plmn);
phone.getContext().sendStickyBroadcast(intent);
}
mCurPlmn = plmn;
mCurrentSpn = spn;
}
@Override @Override
protected void log(String s) { protected void log(String s) {
Log.d(LOG_TAG, "[CdmaLteSST] " + s); Log.d(LOG_TAG, "[CdmaLteSST] " + s);