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

Commit 29b5d8e4 authored by John Wang's avatar John Wang
Browse files

resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp 

Change-Id: I2ee98d03fb1e6e3f5c2325d59d54621fa97eb6ff
parent f8a1f90c

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

+2 −2
Original line number Diff line number Diff line
@@ -503,8 +503,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 +