diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java index ed81e3bdf7d..e2c6412ba57 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java @@ -95,7 +95,13 @@ public class SatelliteSettingPreferenceController extends return UNSUPPORTED_ON_DEVICE; } - return mIsCarrierSatelliteAttachSupported ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + int availabilityStatus = mIsCarrierSatelliteAttachSupported + ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + if (availabilityStatus == AVAILABLE && mIsCarrierRoamingNtnConnectedTypeManual + && !mIsSatelliteSmsAvailableForManualType) { + availabilityStatus = CONDITIONALLY_UNAVAILABLE; + } + return availabilityStatus; } @Override