commit c1a1cca866ff76a6dbfa500292593d8031908a9b
author Jim Miller <jaggies@google.com> Fri Oct 28 00:22:53 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 28 00:22:53 2011 -0700
tree 677606384447fe243da863fa0514ae0e82823c8e
parent ca50b44e2f8a279a37c31dbf9571e12a1e429493
parent be95d778701d24c6e550bff45fa1e04c1714a721

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

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
index 6614d79..dafbdcf 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 @@
      * @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 "";