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

Commit c1a1cca8 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1

parents ca50b44e be95d778

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

+6 −4
Original line number Diff line number Diff line
@@ -635,11 +635,13 @@ class KeyguardStatusViewManager implements OnClickListener { 
     * @return

     */

    private static CharSequence makeCarierString(CharSequence plmn, CharSequence spn) {

        if (plmn != null && spn == null) {

            return plmn;

        } else if (plmn != null && spn != null) {

        final boolean plmnValid = !TextUtils.isEmpty(plmn);

        final boolean spnValid = !TextUtils.isEmpty(spn);

        if (plmnValid && spnValid) {

            return plmn + "|" + spn;

        } else if (plmn == null && spn != null) {

        } else if (plmnValid) {

            return plmn;

        } else if (spnValid) {

            return spn;

        } else {

            return "";