Merge "update to block sending check message when p2p is disabled." into main (10a606c8) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -1374,7 +1374,14 @@ public class DatagramDispatcher extends Handler {
		private boolean allowMtSmsPolling() {
		if (!mFeatureFlags.carrierRoamingNbIotNtn()) return false;

		if (mIsMtSmsPollingThrottled) return false;
		SatelliteController satelliteController = SatelliteController.getInstance();
		int subId = satelliteController.getSelectedSatelliteSubId();
		boolean isP2PSmsDisallowed =
		satelliteController.isP2PSmsDisallowedOnCarrierRoamingNtn(subId);
		if (isP2PSmsDisallowed) {
		plogd("allowMtSmsPolling: P2P SMS disallowed, subId = " + subId);
		return false;
		}

		if (!mIsAligned) return false;

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -8344,7 +8344,6 @@ public class SatelliteController extends Handler {
		* return {@code true} when the phone does not support P2P SMS over carrier roaming satellite
		* {@code false} otherwise
		*/
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
		public boolean isP2PSmsDisallowedOnCarrierRoamingNtn(int subId) {
		int carrierRoamingNtnConnectType = getCarrierRoamingNtnConnectType(subId);
		if (carrierRoamingNtnConnectType == CARRIER_ROAMING_NTN_CONNECT_MANUAL) {

tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java

+27 −3

Original line number	Diff line number	Diff line
		@@ -1264,9 +1264,6 @@ public class DatagramDispatcherTest extends TelephonyTest {
		mContextFixture.putBooleanResource(
		R.bool.config_satellite_allow_check_message_in_not_connected, true);

		mDatagramDispatcherUT.onSatelliteModemStateChanged(
		SatelliteManager.SATELLITE_MODEM_STATE_NOT_CONNECTED);

		verify(mMockSmsDispatchersController, times(0)).sendMtSmsPollingMessage();
		}

		@@ -1285,6 +1282,31 @@ public class DatagramDispatcherTest extends TelephonyTest {
		verify(mMockSmsDispatchersController, times(1)).sendMtSmsPollingMessage();
		}

		@Test
		public void testSendsMtSmsPoll_P2PSmsAllowed() {
		mDatagramDispatcherUT.setDeviceAlignedWithSatellite(true);
		when(mFeatureFlags.carrierRoamingNbIotNtn()).thenReturn(true);
		mContextFixture.putBooleanResource(R.bool.config_enabled_mt_sms_polling, true);
		when(mMockSatelliteController.shouldSendSmsToDatagramDispatcher(any(Phone.class)))
		.thenReturn(true);

		// Set P2P SMS disallowed
		when(mMockSatelliteController.isP2PSmsDisallowedOnCarrierRoamingNtn(anyInt()))
		.thenReturn(true);
		mDatagramDispatcherUT.onSatelliteModemStateChanged(
		SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

		verify(mMockSmsDispatchersController, times(0)).sendMtSmsPollingMessage();

		// Set P2P SMS allowed
		when(mMockSatelliteController.isP2PSmsDisallowedOnCarrierRoamingNtn(anyInt()))
		.thenReturn(false);
		mDatagramDispatcherUT.onSatelliteModemStateChanged(
		SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

		verify(mMockSmsDispatchersController, times(1)).sendMtSmsPollingMessage();
		}

		private void setModemState(int state) {
		mDatagramDispatcherUT.onSatelliteModemStateChanged(state);
		}
		@@ -1296,6 +1318,8 @@ public class DatagramDispatcherTest extends TelephonyTest {
		mContextFixture.putBooleanResource(R.bool.config_enabled_mt_sms_polling, true);
		when(mMockSatelliteController.shouldSendSmsToDatagramDispatcher(any(Phone.class)))
		.thenReturn(true);
		when(mMockSatelliteController.isP2PSmsDisallowedOnCarrierRoamingNtn(anyInt()))
		.thenReturn(false);
		// This will trigger mShouldPollMtSms = shouldPollMtSms
		setModemState(SatelliteManager.SATELLITE_MODEM_STATE_NOT_CONNECTED);
		}