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

2014-10-01 00:03:32 +00:00
parent 575bf7e6cc ab1b39f434
commit ab1e241d38
1 changed files with 5 additions and 1 deletions
--- a/packages/Keyguard/src/com/android/keyguard/CarrierText.java
+++ b/packages/Keyguard/src/com/android/keyguard/CarrierText.java
@@ -233,7 +233,11 @@ public class CarrierText extends TextView {
        final boolean plmnValid = !TextUtils.isEmpty(plmn);
        final boolean spnValid = !TextUtils.isEmpty(spn);
        if (plmnValid && spnValid) {
-            return new StringBuilder().append(plmn).append(mSeparator).append(spn).toString();
+            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) {