PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Satellite] Move entitlment check to auto type only." into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-03-16 22:56:23 -07:00
committed by Android (Google) Code Review
parent b08aeb717c 7ca28dd3d6
commit 3c6c586407
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
View File

@@ -186,17 +186,17 @@ public class SatelliteSettingPreferenceController extends
return; return;
} }
if (!mCarrierConfigs.getBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL)) {
preference.setSummary(R.string.satellite_setting_summary_without_entitlement);
return;
}
if (isCarrierRoamingNtnConnectedTypeManual()) { if (isCarrierRoamingNtnConnectedTypeManual()) {
preference.setSummary( preference.setSummary(
mCarrierRoamingNtnModeCallback.isSatelliteSmsAvailable() mCarrierRoamingNtnModeCallback.isSatelliteSmsAvailable()
? R.string.satellite_setting_enabled_summary ? R.string.satellite_setting_enabled_summary
: R.string.satellite_setting_disabled_summary); : R.string.satellite_setting_disabled_summary);
} else { } else {
if (!mCarrierConfigs.getBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL)) {
preference.setSummary(R.string.satellite_setting_summary_without_entitlement);
return;
}
try { try {
Set<Integer> restrictionReason = Set<Integer> restrictionReason =
mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId); mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);

8
tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceControllerTest.java
View File

@@ -217,7 +217,10 @@ public class SatelliteSettingsPreferenceControllerTest {
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @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( mCarrierConfig.putBoolean(
KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
false); false);
@@ -237,9 +240,6 @@ public class SatelliteSettingsPreferenceControllerTest {
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
public void summary_smsAvailableForManualType_showSummaryWithAccount() { public void summary_smsAvailableForManualType_showSummaryWithAccount() {
mCarrierConfig.putBoolean(
KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
true);
mCarrierConfig.putInt( mCarrierConfig.putInt(
CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
CARRIER_ROAMING_NTN_CONNECT_MANUAL); CARRIER_ROAMING_NTN_CONNECT_MANUAL);