From b11ce4284ec2d5fcaaff2470fbb435c32cde9097 Mon Sep 17 00:00:00 2001 From: John Wang Date: Wed, 12 Sep 2012 16:46:41 -0700 Subject: [PATCH] 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 --- .../internal/telephony/gsm/GsmServiceStateTracker.java | 4 ++-- 1 file 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 b7569daa84c8f..4896efb9fc81e 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 +