Merge "Update network request evaluation for satellite when data roaming off" into main (bbe56992) · Commits · e / os / android_frameworks_opt_telephony

flags/satellite.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -81,3 +81,13 @@ flag {
		bug: "357638490"
		is_exported: true
		}

		# OWNER=karthickmj TARGET=25Q4
		flag {

		name: "satellite_25q4_apis"
		namespace: "telephony"
		description: "This flag controls the changes for the new satellite APIs"
		bug: "383254935"
		is_exported: true
		}

src/java/com/android/internal/telephony/data/DataConfigManager.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -891,6 +891,17 @@ public class DataConfigManager extends Handler {
		return mCarrierConfig.getInt(CarrierConfigManager.KEY_SATELLITE_DATA_SUPPORT_MODE_INT);
		}

		/**
		* Returns whether the data roaming setting for satellite connection is ignored.
		*
		* @return {@code true} if data roaming setting for satellite connection is ignored,
		* {@code false} otherwise.
		*/
		public boolean isIgnoringDataRoamingSettingForSatellite() {
		return mCarrierConfig.getBoolean(
		CarrierConfigManager.KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL);
		}

		/**
		* @return Whether data throttling should be reset when the TAC changes from the carrier config.
		*/

src/java/com/android/internal/telephony/data/DataNetworkController.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -1664,7 +1664,11 @@ public class DataNetworkController extends Handler {
		}

		// Check if data roaming is disabled.
		if (mServiceState.getDataRoaming() && !mDataSettingsManager.isDataRoamingEnabled()) {
		// But if the data roaming setting for satellite connection is ignored as the satellite
		// data plan is included in the user mobile plan, then we should not disallow data due to
		// roaming disabled.
		if (mServiceState.getDataRoaming() && !mDataSettingsManager.isDataRoamingEnabled()
		&& !shouldIgnoreDataRoamingSettingForSatellite()) {
		evaluation.addDataDisallowedReason(DataDisallowedReason.ROAMING_DISABLED);
		}

		@@ -1810,6 +1814,18 @@ public class DataNetworkController extends Handler {
		return evaluation;
		}

		/**
		* Returns whether the data roaming setting should be ignored for satellite connection,
		* as the satellite data plan is included in the user mobile plan.
		*
		* @return {@code true} if the data roaming setting should be ignored for satellite connection.
		* {@code false} otherwise.
		*/
		private boolean shouldIgnoreDataRoamingSettingForSatellite() {
		return mServiceState.isUsingNonTerrestrialNetwork()
		&& mDataConfigManager.isIgnoringDataRoamingSettingForSatellite();
		}

		/**
		* This method
		* - At evaluation network request and evaluation data network determines, if

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+188 −0

Original line number	Diff line number	Diff line
		@@ -1987,6 +1987,194 @@ public class DataNetworkControllerTest extends TelephonyTest {
		verifyInternetConnected();
		}

		@Test
		public void testIgnoreDataRoamingSettingForSatellite() throws Exception {
		// set up satellite network and register data roaming
		mIsNonTerrestrialNetwork = true;
		doReturn(true).when(mServiceState).getDataRoaming();
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);

		// Enable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(true);

		// Set network request transport with Internet capability
		mDataNetworkControllerUT.addNetworkRequest(
		createNetworkRequest(true,
		NetworkCapabilities.NET_CAPABILITY_INTERNET,
		NetworkCapabilities.NET_CAPABILITY_NOT_BANDWIDTH_CONSTRAINED));
		processAllMessages();

		// Verify internet is connected
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Disable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);
		processAllMessages();

		// Verify internet is not connected
		verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Setup carrier to bypass data roaming off setting for satellite network
		mCarrierConfig.putBoolean(
		CarrierConfigManager.KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL, true);
		carrierConfigChanged();
		processAllMessages();

		// Verify internet is connected
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// reset satellite network and roaming registration
		mIsNonTerrestrialNetwork = false;
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME);
		}

		@Test
		public void testIgnoreDataRoamingSettingForSatelliteWithBandwithConstrained() throws Exception {
		// set up satellite network and register data roaming
		mIsNonTerrestrialNetwork = true;
		doReturn(true).when(mServiceState).getDataRoaming();
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);

		// Enable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(true);

		// Set network request transport with Internet capability
		mDataNetworkControllerUT.addNetworkRequest(
		createNetworkRequest(true, NetworkCapabilities.NET_CAPABILITY_INTERNET));
		processAllMessages();

		// Verify internet is connected
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Disable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);
		processAllMessages();

		// Verify internet is not connected
		verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Setup carrier to bypass data roaming off setting for satellite network
		mCarrierConfig.putBoolean(
		CarrierConfigManager.KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL, true);
		carrierConfigChanged();
		processAllMessages();

		// Verify internet is connected
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// reset satellite network and roaming registration
		mIsNonTerrestrialNetwork = false;
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME);
		}

		@Test
		public void testIgnoreDataRoamingSettingForSatelliteForUnrestrictedNetwork() throws Exception {
		// set up satellite network and register data roaming
		mIsNonTerrestrialNetwork = true;
		doReturn(true).when(mServiceState).getDataRoaming();
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);

		// Disable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);

		// Set network request transport with Internet capability
		mDataNetworkControllerUT.addNetworkRequest(
		createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_INTERNET));
		processAllMessages();

		// Verify internet is not connected
		verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Setup carrier to bypass data roaming off setting for satellite network
		mCarrierConfig.putBoolean(
		CarrierConfigManager.KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL, true);
		carrierConfigChanged();
		processAllMessages();

		// Verify internet is still not connected
		verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Setup satellite data support mode serve all network requests
		mCarrierConfig.putInt(
		CarrierConfigManager.KEY_SATELLITE_DATA_SUPPORT_MODE_INT,
		CarrierConfigManager.SATELLITE_DATA_SUPPORT_ALL);
		carrierConfigChanged();
		processAllMessages();

		// Verify internet is connected
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// reset satellite network and roaming registration
		mIsNonTerrestrialNetwork = false;
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME);
		}

		@Test
		public void testIgnoreDataRoamingSettingForSatelliteConfigForTerrestialNetwork() throws Exception {
		// set up terrestrial network and roaming registration
		mIsNonTerrestrialNetwork = false;
		doReturn(true).when(mServiceState).getDataRoaming();
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);

		// Enable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(true);

		// Set network request transport with Internet capability
		mDataNetworkControllerUT.addNetworkRequest(
		createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_INTERNET));
		processAllMessages();

		// Verify internet is connected
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Disable data roaming setting
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(false);
		processAllMessages();

		// Verify internet is not connected
		verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Setup carrier to bypass data roaming off setting for satellite network
		mCarrierConfig.putBoolean(
		CarrierConfigManager.KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL, true);
		carrierConfigChanged();
		processAllMessages();

		// Verify internet is still not connected
		verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// Enable data roaming again
		mDataNetworkControllerUT.getDataSettingsManager().setDataRoamingEnabled(true);
		processAllMessages();

		// Verify internet is connected again
		verifyInternetConnected();
		Mockito.clearInvocations(mMockedDataNetworkControllerCallback);

		// reset roaming registration
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME);
		}

		@Test
		public void testDataEnabledChanged() throws Exception {
		mDataNetworkControllerUT.getDataSettingsManager().setDataEnabled(