From b35faf0958915293b03e27768a7b01632c4e4226 Mon Sep 17 00:00:00 2001 From: Hakjun Choi Date: Thu, 29 Feb 2024 06:14:42 +0000 Subject: [PATCH] Apply satellite feature flag to Settings activity Added carrier satellite condition to determine whether satellite settins menu should be exposed or not. if carrier satellite feature is not enabled, satellite settings menu will not be shown Bug: 327539253 Test: manual test with feature key disabled / enabled condition on pixel Change-Id: I1abc84c2c47b48c0137274666da37bede10d2ae6 --- .../telephony/SatelliteSettingPreferenceController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java index 94940b364f9..5e8a3c3d7e3 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java @@ -29,6 +29,7 @@ import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.internal.telephony.flags.Flags; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.network.CarrierConfigCache; @@ -58,6 +59,11 @@ public class SatelliteSettingPreferenceController extends @Override public int getAvailabilityStatus(int subId) { + if (!Flags.carrierEnabledSatelliteFlag()) { + logd("getAvailabilityStatus() : carrierEnabledSatelliteFlag is disabled"); + return UNSUPPORTED_ON_DEVICE; + } + final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId); final boolean isSatelliteAttachSupported = carrierConfig.getBoolean( CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);