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

Commit 533c9461 authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by Android Git Automerger
Browse files

am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 

* commit 'ab1e241d':
  Show one name if both plmn and spn are equal
parents 0d4d8b19 ab1e241d

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+5 −1
Original line number Diff line number Diff line
@@ -233,7 +233,11 @@ public class CarrierText extends TextView { 
        final boolean plmnValid = !TextUtils.isEmpty(plmn);

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

        if (plmnValid && spnValid) {

            if (plmn.equals(spn)) {

                return plmn;

            } else {

                return new StringBuilder().append(plmn).append(mSeparator).append(spn).toString();

            }

        } else if (plmnValid) {

            return plmn;

        } else if (spnValid) {