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

This commit is contained in:
Treehugger Robot
2025-03-16 22:56:23 -07:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 9 deletions

View File

@@ -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);