Merge "lockscreen: Don't show '|' in carrier label if plmn/spn is empty" into gingerbread (84534289) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1083,12 +1083,12 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
		}

		static CharSequence getCarrierString(CharSequence telephonyPlmn, CharSequence telephonySpn) {
		if (telephonyPlmn != null && telephonySpn == null) {
		if (telephonyPlmn != null && (telephonySpn == null \|\| "".contentEquals(telephonySpn))) {
		return telephonyPlmn;
		} else if (telephonySpn != null && (telephonyPlmn == null \|\| "".contentEquals(telephonyPlmn))) {
		return telephonySpn;
		} else if (telephonyPlmn != null && telephonySpn != null) {
		return telephonyPlmn + "\|" + telephonySpn;
		} else if (telephonyPlmn == null && telephonySpn != null) {
		return telephonySpn;
		} else {
		return "";
		}