Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5cbd762 authored by John Wang's avatar John Wang Committed by Android (Google) Code Review
Browse files

Merge "Show plmn in emergency call allowed mode." into jb-dev

parents 2f140f96 b11ce428

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -512,8 +512,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                || !TextUtils.equals(plmn, curPlmn)) {

                || !TextUtils.equals(plmn, curPlmn)) {

            boolean showSpn = !mEmergencyOnly && !TextUtils.isEmpty(spn)

            boolean showSpn = !mEmergencyOnly && !TextUtils.isEmpty(spn)

                && (rule & SIMRecords.SPN_RULE_SHOW_SPN) == SIMRecords.SPN_RULE_SHOW_SPN;

                && (rule & SIMRecords.SPN_RULE_SHOW_SPN) == SIMRecords.SPN_RULE_SHOW_SPN;

            boolean showPlmn = !TextUtils.isEmpty(plmn) &&

            boolean showPlmn = !TextUtils.isEmpty(plmn) && (mEmergencyOnly ||

                (rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN;

                ((rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN));





            if (DBG) {

            if (DBG) {

                log(String.format("updateSpnDisplay: changed sending intent" + " rule=" + rule +

                log(String.format("updateSpnDisplay: changed sending intent" + " rule=" + rule +