Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 323807f4: am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev

Browse Source 
* commit '323807f4832dd79dddfd441fc8fdad7465931c6b':
  Show one name if both plmn and spn are equal
This commit is contained in:
Vineeta Srivastava
2014-10-01 17:19:17 +00:00
committed by Android Git Automerger
parent 9f10be6722 323807f483
commit b476d1dc2a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Keyguard/src/com/android/keyguard/CarrierText.java
View File

@@ -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) {