commit b6a964815e93f700fbd422af5b701caef4d21a61
author Aishwarya Mallampati <amallampati@google.com> Wed Jan 29 23:07:15 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 29 23:07:15 2025 -0800
tree e34c2a7a8210975b7db168850e36464b545da7d7
parent 2d8cd122e4f6949d8ff09d6091108e5ae1b164b3
parent d7769ad1805aaf53d22feeeca5d0b766bc202f54

Merge "Do not show satellite messaging in sim settings if sms is not supported" into main

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

diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index ed81e3b..e2c6412 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -95,7 +95,13 @@
             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