From ab1b39f434265691c3ea3002ece51c566c3171bf Mon Sep 17 00:00:00 2001 From: Sungmin Choi Date: Mon, 29 Sep 2014 15:21:15 +0900 Subject: [PATCH] Show one name if both plmn and spn are equal If both plmn and SPN are SKTelecom, lockscreen is shown as SKTelecom-SKTelecom. In this case, it would be better to show only SKTelecom. Bug: 17702041 Change-Id: I268455b037752cf21a3247be7809283f50b72c27 --- packages/Keyguard/src/com/android/keyguard/CarrierText.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/Keyguard/src/com/android/keyguard/CarrierText.java index 05f2962bac99..ad07a7a9d16a 100644 --- 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) { -- 2.11.0