From d7769ad1805aaf53d22feeeca5d0b766bc202f54 Mon Sep 17 00:00:00 2001 From: Aishwarya Mallampati Date: Wed, 29 Jan 2025 21:57:26 +0000 Subject: [PATCH] Do not show satellite messaging in sim settings if sms is not supported Bug: 393181741 Test: 393186308 Flag: EXEMPT bugfix Change-Id: I1cb1d22541ba68ce20a0fd9319ddb2d5fc5d6715 --- .../telephony/SatelliteSettingPreferenceController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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