diff options
| author | Erica Chang <echang@cyngn.com> | 2015-04-17 12:07:48 -0700 |
|---|---|---|
| committer | Erica Chang <echang@cyngn.com> | 2015-04-23 17:12:06 -0700 |
| commit | c4d59b8ac8b0cd1190fb27e11927dd164bdb128c (patch) | |
| tree | 3a536d6a88ad4eb16a7ec394aeb636ac06e79574 | |
| parent | 92181e5046744bc5afcecad23374a704552005fb (diff) | |
| download | android_frameworks_opt_telephony-c4d59b8ac8b0cd1190fb27e11927dd164bdb128c.tar.gz android_frameworks_opt_telephony-c4d59b8ac8b0cd1190fb27e11927dd164bdb128c.tar.bz2 android_frameworks_opt_telephony-c4d59b8ac8b0cd1190fb27e11927dd164bdb128c.zip | |
frameworks: telephony: SPN display should check cdma.home sys prop
Change-Id: I67c760668b1bea137c6d81e5219958e884e0a4ee
| -rw-r--r-- | src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 6a66b34cd..1750ba98c 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -62,6 +62,7 @@ import com.android.internal.telephony.uicc.UiccCardApplication; import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.HbpcdUtils; import com.android.internal.telephony.uicc.RuimRecords; +import com.android.internal.telephony.Operators; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -603,8 +604,13 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { if (DBG) log("updateSpnDisplay: radio is on but out " + "of service, set plmn='" + plmn + "'"); } else if (combinedRegState == ServiceState.STATE_IN_SERVICE) { + if (SystemProperties.getBoolean("ro.cdma.force_plmn_lookup", false)) { + plmn = Operators.operatorReplace(mSS.getOperatorNumeric()); + } else { + plmn = TextUtils.isEmpty(mSS.getOperatorAlphaLong()) ? SystemProperties.get( + "ro.cdma.home.operator.alpha", "") : mSS.getOperatorAlphaLong(); + } // depends on the rule and whether plmn or spn is null - plmn = mSS.getOperatorAlphaLong(); showPlmn = ( !TextUtils.isEmpty(plmn)) && ((rule & RuimRecords.SPN_RULE_SHOW_PLMN) == RuimRecords.SPN_RULE_SHOW_PLMN); spn = (mIccRecords != null) ? mIccRecords.getServiceProviderName() : ""; |