Merge "Do not consider SIM state for inactive SIM/modem slot." (a575fdfc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -172,14 +172,17 @@ public class CarrierTextController {
		mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		mSeparator = separator;
		mWakefulnessLifecycle = Dependency.get(WakefulnessLifecycle.class);
		mSimSlotsNumber = ((TelephonyManager) context.getSystemService(
		Context.TELEPHONY_SERVICE)).getSupportedModemCount();
		mSimSlotsNumber = getTelephonyManager().getSupportedModemCount();
		mSimErrorState = new boolean[mSimSlotsNumber];
		updateDisplayOpportunisticSubscriptionCarrierText(SystemProperties.getBoolean(
		TelephonyProperties.DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME,
		false));
		}

		private TelephonyManager getTelephonyManager() {
		return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
		}

		/**
		* Checks if there are faulty cards. Adds the text depending on the slot of the card
		*
		@@ -195,7 +198,7 @@ public class CarrierTextController {
		CharSequence carrierTextForSimIOError = getCarrierTextForSimState(
		IccCardConstants.State.CARD_IO_ERROR, carrier);
		// mSimErrorState has the state of each sim indexed by slotID.
		for (int index = 0; index < mSimErrorState.length; index++) {
		for (int index = 0; index < getTelephonyManager().getActiveModemCount(); index++) {
		if (!mSimErrorState[index]) {
		continue;
		}
		@@ -228,8 +231,7 @@ public class CarrierTextController {
		* @param callback Callback to provide text updates
		*/
		public void setListening(CarrierTextCallback callback) {
		TelephonyManager telephonyManager = ((TelephonyManager) mContext
		.getSystemService(Context.TELEPHONY_SERVICE));
		TelephonyManager telephonyManager = getTelephonyManager();
		if (callback != null) {
		mCarrierTextCallback = callback;
		if (ConnectivityManager.from(mContext).isNetworkSupported(

packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@ public class CarrierTextControllerTest extends SysuiTestCase {
		mCarrierTextCallbackInfo = new CarrierTextController.CarrierTextCallbackInfo("",
		new CharSequence[]{}, false, new int[]{});
		when(mTelephonyManager.getSupportedModemCount()).thenReturn(3);
		when(mTelephonyManager.getActiveModemCount()).thenReturn(3);

		mCarrierTextController = new TestCarrierTextController(mContext, SEPARATOR, true, true,
		mKeyguardUpdateMonitor);
		@@ -183,6 +184,15 @@ public class CarrierTextControllerTest extends SysuiTestCase {
		// There's only one subscription in the list
		assertEquals(1, captor.getValue().listOfCarriers.length);
		assertEquals(TEST_CARRIER, captor.getValue().listOfCarriers[0]);

		// Now it becomes single SIM active mode.
		reset(mCarrierTextCallback);
		when(mTelephonyManager.getActiveModemCount()).thenReturn(1);
		// Update carrier text. It should ignore error state of subId 3 in inactive slotId.
		mCarrierTextController.updateCarrierText();
		mTestableLooper.processAllMessages();
		verify(mCarrierTextCallback).updateCarrierInfo(captor.capture());
		assertEquals("TEST_CARRIER", captor.getValue().carrierText);
		}

		@Test