Merge "[Satellite] Move entitlment check to auto type only." into main (3c6c5864) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -186,17 +186,17 @@ public class SatelliteSettingPreferenceController extends
		return;
		}

		if (!mCarrierConfigs.getBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL)) {
		preference.setSummary(R.string.satellite_setting_summary_without_entitlement);
		return;
		}

		if (isCarrierRoamingNtnConnectedTypeManual()) {
		preference.setSummary(
		mCarrierRoamingNtnModeCallback.isSatelliteSmsAvailable()
		? R.string.satellite_setting_enabled_summary
		: R.string.satellite_setting_disabled_summary);
		} else {
		if (!mCarrierConfigs.getBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL)) {
		preference.setSummary(R.string.satellite_setting_summary_without_entitlement);
		return;
		}

		try {
		Set<Integer> restrictionReason =
		mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);

+4 −4

Original line number	Diff line number	Diff line
		@@ -217,7 +217,10 @@ public class SatelliteSettingsPreferenceControllerTest {

		@Test
		@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
		public void summary_noEntitlement_showSummaryWithoutEntitlement() {
		public void summary_noEntitlementAndTypeIsAuto_showSummaryWithoutEntitlement() {
		mCarrierConfig.putInt(
		CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
		CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC);
		mCarrierConfig.putBoolean(
		KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
		false);
		@@ -237,9 +240,6 @@ public class SatelliteSettingsPreferenceControllerTest {
		@Test
		@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
		public void summary_smsAvailableForManualType_showSummaryWithAccount() {
		mCarrierConfig.putBoolean(
		KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
		true);
		mCarrierConfig.putInt(
		CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
		CARRIER_ROAMING_NTN_CONNECT_MANUAL);