Merge "Update signal threshold criteria after NTN->OOS->NTN" into main (5ce204ad) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SignalStrengthController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1356,6 +1356,7 @@ public class SignalStrengthController extends Handler {

		private void onServiceStateChanged(ServiceState state) {
		if (state.getState() != ServiceState.STATE_IN_SERVICE) {
		mNTNConnected.set(false);
		return;
		}

tests/telephonytests/src/com/android/internal/telephony/SignalStrengthControllerTest.java

+64 −0

Original line number	Diff line number	Diff line
		@@ -1513,6 +1513,70 @@ public class SignalStrengthControllerTest extends TelephonyTest {
		reset(mSimulatedCommandsVerifier);
		}

		@Test
		public void testLteSignalStrengthReportingCriteriaWhenApmOnOff() {
		SignalStrength ss = new SignalStrength(
		new CellSignalStrengthCdma(),
		new CellSignalStrengthGsm(),
		new CellSignalStrengthWcdma(),
		new CellSignalStrengthTdscdma(),
		new CellSignalStrengthLte(
		-110, /* rssi */
		-114, /* rsrp */
		-5, /* rsrq */
		0, /* rssnr */
		SignalStrength.INVALID, /* cqi */
		SignalStrength.INVALID /* ta */),
		new CellSignalStrengthNr());

		// RSRP NTN_LTE threshold set to Good and LTE threshold set to poor.
		mBundle.putInt(CarrierConfigManager.KEY_PARAMETERS_USED_FOR_NTN_LTE_SIGNAL_BAR_INT,
		CellSignalStrengthLte.USE_RSRP);
		mBundle.putIntArray(CarrierConfigManager.KEY_NTN_LTE_RSRP_THRESHOLDS_INT_ARRAY,
		new int[]{-125 /* SIGNAL_STRENGTH_POOR /, -120 / SIGNAL_STRENGTH_MODERATE */,
		-115 /* SIGNAL_STRENGTH_GOOD /, -110/ SIGNAL_STRENGTH_GREAT */});
		mBundle.putIntArray(CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY,
		new int[]{-114, /* SIGNAL_STRENGTH_POOR / -110, / SIGNAL_STRENGTH_MODERATE */
		-105, /* SIGNAL_STRENGTH_GOOD / -100, / SIGNAL_STRENGTH_GREAT */});
		CarrierConfigManager mockConfigManager = Mockito.mock(CarrierConfigManager.class);
		when(mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE))
		.thenReturn(mockConfigManager);
		when(mockConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle);

		// NTN -> APM ON -> APM OFF -> NTN
		// When NTN is connected, check the signal strength is GOOD
		AsyncResult asyncResult = mock(AsyncResult.class);
		asyncResult.result = mServiceState;
		doReturn(true).when(mServiceState).isUsingNonTerrestrialNetwork();
		mSsc.handleMessage(mSsc.obtainMessage(10/EVENT_SERVICE_STATE_CHANGED/, asyncResult));
		processAllMessages();

		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		processAllMessages();
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_GOOD, mSsc.getSignalStrength().getLevel());

		// APM ON -> APM OFF triggers EVENT_ON_DEVICE_IDLE_STATE_CHANGED
		// Thresholds are updated to LTE, check the signal strength is poor.
		doReturn(false).when(mServiceState).isUsingNonTerrestrialNetwork();
		mSsc.onDeviceIdleStateChanged(false);
		processAllMessages();
		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		processAllMessages();
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_POOR, mSsc.getSignalStrength().getLevel());

		// Again When NTN is connected, thresholds are updated to NTN LTE
		doReturn(true).when(mServiceState).isUsingNonTerrestrialNetwork();
		mSsc.handleMessage(mSsc.obtainMessage(10/EVENT_SERVICE_STATE_CHANGED/, asyncResult));
		processAllMessages();

		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		processAllMessages();
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_GOOD, mSsc.getSignalStrength().getLevel());
		}

		private void verifyAllEmptyThresholdAreDisabledWhenSetSignalStrengthReportingCriteria(
		int expectedNonEmptyThreshold) {
		ArgumentCaptor<List<SignalThresholdInfo>> signalThresholdInfoCaptor =