| commit | 6df5cb0bc43531df9463e03ddeab2a037dbf7508 | [log] [tgz] |
|---|---|---|
| author | Aishwarya Mallampati <amallampati@google.com> | Wed Jan 29 21:57:26 2025 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Jan 30 10:44:48 2025 -0800 |
| tree | 13e436207e1e9276597f99c8a6def4c10c4e0b9b | |
| parent | 94cd5e30964618d758be6821f54dded6fba5338d [diff] |
Do not show satellite messaging in sim settings if sms is not supported Bug: 393181741 Test: 393186308 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d7769ad1805aaf53d22feeeca5d0b766bc202f54) Merged-In: I1cb1d22541ba68ce20a0fd9319ddb2d5fc5d6715 Change-Id: I1cb1d22541ba68ce20a0fd9319ddb2d5fc5d6715
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java index b84c780..e5ddabf 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