Merge "resolve merge conflicts of bfe2580b2479 to master" (e0870adb) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ public class MobileSignalController extends SignalController<
		if (isCarrierNetworkChangeActive()) {
		return false;
		}
		if (isCdma()) {
		if (isCdma() && mServiceState != null) {
		final int iconMode = mServiceState.getCdmaEriIconMode();
		return mServiceState.getCdmaEriIconIndex() != EriInfo.ROAMING_INDICATOR_OFF
		&& (iconMode == EriInfo.ROAMING_ICON_MODE_NORMAL
		@@ -520,11 +520,13 @@ public class MobileSignalController extends SignalController<
		+ " dataState=" + state.getDataRegState());
		}
		mServiceState = state;
		if (state != null) {
		mDataNetType = state.getDataNetworkType();
		if (mDataNetType == TelephonyManager.NETWORK_TYPE_LTE && mServiceState != null &&
		mServiceState.isUsingCarrierAggregation()) {
		mDataNetType = TelephonyManager.NETWORK_TYPE_LTE_CA;
		}
		}
		updateTelephony();
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,14 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
		}
		}

		@Test
		public void testRoamingNoService_DoesNotCrash() {
		setupDefaultSignal();
		setCdma();
		mServiceState = null;
		updateServiceState();
		}

		@Test
		public void testQsSignalStrength() {
		for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;