Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show plmn in emergency call allowed mode.

Browse Source 
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
This commit is contained in:
John Wang
2012-09-12 16:46:41 -07:00
committed by The Android Automerger
parent a9d7d853d1
commit 199bc563e3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -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 +