diff options
| author | John Wang <johnwang@google.com> | 2012-09-13 09:36:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-13 09:36:48 -0700 |
| commit | f5cbd7628d2e74e9d6aac406403a7d3c57cbe97f (patch) | |
| tree | 75bfd55cdee73fe0da5d5e379917ae5438b9aa51 | |
| parent | 2f140f9692c3f8e8ae278839637ff5f72d145c60 (diff) | |
| parent | b11ce4284ec2d5fcaaff2470fbb435c32cde9097 (diff) | |
| download | frameworks_base-f5cbd7628d2e74e9d6aac406403a7d3c57cbe97f.zip frameworks_base-f5cbd7628d2e74e9d6aac406403a7d3c57cbe97f.tar.gz frameworks_base-f5cbd7628d2e74e9d6aac406403a7d3c57cbe97f.tar.bz2 | |
Merge "Show plmn in emergency call allowed mode." into jb-dev
| -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 b7569da..4896efb 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 + |