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

Commit 687cb868 authored by Orlowski, Rafal (EXT)'s avatar Orlowski, Rafal (EXT) Committed by android-build-merger
Browse files

Merge "Disable showSpn under no service condition" am: 900cf1ac 

am: d149325f

Change-Id: I198a929d03a629c5978e3ab260a37ce835428bac
parents b357e94e d149325f

src/java/com/android/internal/telephony/ServiceStateTracker.java

+3 −1
Original line number Diff line number Diff line
@@ -2148,6 +2148,7 @@ public class ServiceStateTracker extends Handler { 
            String plmn = null;

            boolean showPlmn = false;

            int rule = (iccRecords != null) ? iccRecords.getDisplayRule(mSS) : 0;

            boolean noService = false;

            if (combinedRegState == ServiceState.STATE_OUT_OF_SERVICE

                    || combinedRegState == ServiceState.STATE_EMERGENCY_ONLY) {

                showPlmn = true;
@@ -2164,6 +2165,7 @@ public class ServiceStateTracker extends Handler { 
                    // No service at all

                    plmn = Resources.getSystem().

                            getText(com.android.internal.R.string.lockscreen_carrier_default).toString();

                    noService = true;

                }

                if (DBG) log("updateSpnDisplay: radio is on but out " +

                        "of service, set plmn='" + plmn + "'");
@@ -2188,7 +2190,7 @@ public class ServiceStateTracker extends Handler { 
            //    EXTRA_DATA_SPN = dataSpn

            String spn = (iccRecords != null) ? iccRecords.getServiceProviderName() : "";

            String dataSpn = spn;

            boolean showSpn = !TextUtils.isEmpty(spn)

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

                    && ((rule & SIMRecords.SPN_RULE_SHOW_SPN)

                    == SIMRecords.SPN_RULE_SHOW_SPN);