diff options
| author | John Wang <johnwang@google.com> | 2012-05-07 15:32:58 -0700 |
|---|---|---|
| committer | John Wang <johnwang@google.com> | 2012-05-07 16:41:29 -0700 |
| commit | 290e1c9396aa8da3665c55d72f4b4a1f5d9277ce (patch) | |
| tree | 97bebd0393035934070c2d6fe66ab463b02cb1e7 /telephony | |
| parent | ff0e8cd8b60aa8372b06edecb2e754b0905c4d31 (diff) | |
| download | frameworks_base-290e1c9396aa8da3665c55d72f4b4a1f5d9277ce.zip frameworks_base-290e1c9396aa8da3665c55d72f4b4a1f5d9277ce.tar.gz frameworks_base-290e1c9396aa8da3665c55d72f4b4a1f5d9277ce.tar.bz2 | |
Set provider name in airplane mode.
Set eriText to correct provider alpha during power_off state.
bug:5262482
Change-Id: Ic72aaf0465cde6934a2b46d4b9520627ac0ac335
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index 297c2ac..0a40c75 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java @@ -343,10 +343,16 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { // new ERI text if (ss.getState() == ServiceState.STATE_IN_SERVICE) { eriText = phone.getCdmaEriText(); + } else if (ss.getState() == ServiceState.STATE_POWER_OFF) { + eriText = phone.mIccRecords.getServiceProviderName(); + if (TextUtils.isEmpty(eriText)) { + // Sets operator alpha property by retrieving from + // build-time system property + eriText = SystemProperties.get("ro.cdma.home.operator.alpha"); + } } else { // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used - // for - // mRegistrationState 0,2,3 and 4 + // for mRegistrationState 0,2,3 and 4 eriText = phone.getContext() .getText(com.android.internal.R.string.roamingTextSearching).toString(); } |