SystemUI: Fix network label regression (27742ae7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -932,17 +932,19 @@ public class MSimNetworkController extends NetworkController {
		str.append(plmn);
		something = true;
		}
		if (showSpn && spn != null &&
		!spn.equals(plmn) &&
		if (showSpn && spn != null) {
		if (something && showPlmn
		&& !spn.equals(plmn) &&
		!mEmergencyCallOnlyLabel.equals(plmn)) {
		if (something) {
		str.append(" ");
		str.append(mNetworkNameSeparator);
		str.append(" ");
		}
		str.append(spn);
		} else if (!showPlmn) {
		str.append(spn);
		something = true;
		}
		}
		if (something) {
		mMSimNetworkName[subscription] = str.toString();
		} else {

+8 −7

Original line number	Diff line number	Diff line
		@@ -461,7 +461,6 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		@Override
		public void onReceive(Context context, Intent intent) {
		final String action = intent.getAction();
		Log.d(TAG, "onReceive() " + action);
		if (action.equals(WifiManager.RSSI_CHANGED_ACTION)
		\|\| action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)
		\|\| action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
		@@ -956,17 +955,19 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		str.append(plmn);
		something = true;
		}
		if (showSpn && spn != null &&
		!spn.equals(plmn) &&
		if (showSpn && spn != null) {
		if (something && showPlmn
		&& !spn.equals(plmn) &&
		!mEmergencyCallOnlyLabel.equals(plmn)) {
		if (something) {
		str.append(" ");
		str.append(mNetworkNameSeparator);
		str.append(" ");
		}
		str.append(spn);
		} else if (!showPlmn) {
		str.append(spn);
		something = true;
		}
		}
		if (something) {
		mNetworkName = str.toString();
		} else {