diff options
| author | John Wang <johnwang@google.com> | 2012-09-13 12:07:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-13 12:07:13 -0700 |
| commit | f022afffe951c56fd2c1fda40b0e276fd21edb20 (patch) | |
| tree | d25d067f94ff399a380f19c14d928f51f32c2677 /src/java/com/android/internal/telephony/gsm | |
| parent | b840987a39e7149c1364739696977089cd53814d (diff) | |
| parent | 29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b (diff) | |
| download | frameworks_opt_telephony-f022afffe951c56fd2c1fda40b0e276fd21edb20.zip frameworks_opt_telephony-f022afffe951c56fd2c1fda40b0e276fd21edb20.tar.gz frameworks_opt_telephony-f022afffe951c56fd2c1fda40b0e276fd21edb20.tar.bz2 | |
am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
* commit '29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b':
resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
Diffstat (limited to 'src/java/com/android/internal/telephony/gsm')
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 03ac5d7..767f358 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -502,8 +502,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 + |