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

Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1

Browse Source
This commit is contained in:
Jim Miller
2011-10-28 00:22:53 -07:00
committed by Android (Google) Code Review
parent ca50b44e2f be95d77870
commit c1a1cca866
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
View File

@@ -635,11 +635,13 @@ class KeyguardStatusViewManager implements OnClickListener {
* @return
*/
private static CharSequence makeCarierString(CharSequence plmn, CharSequence spn) {
if (plmn != null && spn == null) {
return plmn;
} else if (plmn != null && spn != null) {
final boolean plmnValid = !TextUtils.isEmpty(plmn);
final boolean spnValid = !TextUtils.isEmpty(spn);
if (plmnValid && spnValid) {
return plmn + "|" + spn;
} else if (plmn == null && spn != null) {
} else if (plmnValid) {
return plmn;
} else if (spnValid) {
return spn;
} else {
return "";