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

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

Browse Source 
* commit '533c9461569c171fbdfe51cff708c27c10302353':
  Show one name if both plmn and spn are equal
This commit is contained in:
Vineeta Srivastava
2014-10-01 15:15:51 +00:00
committed by Android Git Automerger
parent f5e527039b 533c946156
commit 3cc41b8edd
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 plmnValid = !TextUtils.isEmpty(plmn);
final boolean spnValid = !TextUtils.isEmpty(spn); final boolean spnValid = !TextUtils.isEmpty(spn);
if (plmnValid && spnValid) { 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) { } else if (plmnValid) {
return plmn; return plmn;
} else if (spnValid) { } else if (spnValid) {