diff options
| author | John Wang <johnwang@google.com> | 2012-09-12 16:46:41 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-09-21 18:04:24 -0700 |
| commit | 199bc563e3afb13dee44aec1eeda6be80188caca (patch) | |
| tree | b27dc0e13ef13dea50f0871942efb368f4f61dd8 | |
| parent | a9d7d853d117b617ded3af1ed8e56bd3590ee258 (diff) | |
| download | base-199bc563e3afb13dee44aec1eeda6be80188caca.tar.gz | |
Show plmn in emergency call allowed mode.
When emergency call is allowed, plmn string is used to pass up the
"Emergency calls only" string. This change set showPlmn to true
in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value.
bug:7103854
Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index b7569daa84c8..4896efb9fc81 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -512,8 +512,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker { || !TextUtils.equals(plmn, curPlmn)) { boolean showSpn = !mEmergencyOnly && !TextUtils.isEmpty(spn) && (rule & SIMRecords.SPN_RULE_SHOW_SPN) == SIMRecords.SPN_RULE_SHOW_SPN; - boolean showPlmn = !TextUtils.isEmpty(plmn) && - (rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN; + boolean showPlmn = !TextUtils.isEmpty(plmn) && (mEmergencyOnly || + ((rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN)); if (DBG) { log(String.format("updateSpnDisplay: changed sending intent" + " rule=" + rule + |