Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

lockscreen: Don't show '|' in carrier label if plmn/spn is empty

Don't show separator '|' in carrier label on lockscreen if both
plmn and spn are not null, and one of them is an empty string.

Change-Id: Ibccb20d45989c8a1a220679cef7aea474be0237a
  • Loading branch information...
commit 2495adfb680f968afcb7c69bbbb427f3eed62c85 1 parent a9e322e
Ladios Jonquil authored May 28, 2011
6  policy/src/com/android/internal/policy/impl/LockScreen.java
@@ -1083,12 +1083,12 @@ private void updateLayout(Status status) {
1083 1083
     }
1084 1084
 
1085 1085
     static CharSequence getCarrierString(CharSequence telephonyPlmn, CharSequence telephonySpn) {
1086  
-        if (telephonyPlmn != null && telephonySpn == null) {
  1086
+        if (telephonyPlmn != null && (telephonySpn == null || "".contentEquals(telephonySpn))) {
1087 1087
             return telephonyPlmn;
  1088
+        } else if (telephonySpn != null && (telephonyPlmn == null || "".contentEquals(telephonyPlmn))) {
  1089
+            return telephonySpn;
1088 1090
         } else if (telephonyPlmn != null && telephonySpn != null) {
1089 1091
             return telephonyPlmn + "|" + telephonySpn;
1090  
-        } else if (telephonyPlmn == null && telephonySpn != null) {
1091  
-            return telephonySpn;
1092 1092
         } else {
1093 1093
             return "";
1094 1094
         }

0 notes on commit 2495adf

Please sign in to comment.
Something went wrong with that request. Please try again.