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

1 files changed, 6 insertions, 4 deletions

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
index 6614d7929496..dafbdcfed7b3 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
@@ -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 "";