From 1a53ea7a05b410b6a6f62049a5ac0916b87ed913 Mon Sep 17 00:00:00 2001 From: Hakjun Choi Date: Wed, 5 Feb 2025 06:36:43 +0000 Subject: [PATCH] Clean up aconfig flag carrier_enabled_satellite_flag Bug: 393951373 FLAG: EXEMPT flag clean up Test: atest NetworkSelectSettingsTest WifiCallingSettingsForSubTest SatelliteSettingsPreferenceControllerTest Test: manual test in live network Change-Id: I154e9be8a8c771fafb37af078be7b495f18b6100 --- .../network/telephony/NetworkSelectSettings.java | 5 ----- .../settings/network/telephony/SatelliteSetting.java | 9 --------- .../telephony/SatelliteSettingPreferenceController.java | 6 ------ .../SatelliteSettingsPreferenceCategoryController.java | 4 ---- .../settings/wifi/calling/WifiCallingSettingsForSub.java | 5 ----- .../wifi/calling/WifiCallingSettingsForSubTest.java | 3 --- .../SatelliteSettingsPreferenceControllerTest.java | 6 ------ 7 files changed, 38 deletions(-) diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index 4ae51ab1493..5b2eba2f80d 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -44,7 +44,6 @@ import androidx.preference.PreferenceCategory; import com.android.internal.annotations.Initializer; import com.android.internal.telephony.OperatorInfo; -import com.android.internal.telephony.flags.Flags; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.telephony.scan.NetworkScanRepository; @@ -343,10 +342,6 @@ public class NetworkSelectSettings extends DashboardFragment { */ @VisibleForTesting protected List getSatellitePlmnsForCarrierWrapper() { - if (!Flags.carrierEnabledSatelliteFlag()) { - return new ArrayList<>(); - } - if (mSatelliteManager != null) { return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId); } else { diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/SatelliteSetting.java index bc10abb212d..f99011d1ede 100644 --- a/src/com/android/settings/network/telephony/SatelliteSetting.java +++ b/src/com/android/settings/network/telephony/SatelliteSetting.java @@ -50,7 +50,6 @@ import androidx.annotation.Nullable; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.telephony.flags.Flags; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settingslib.HelpUtils; @@ -102,14 +101,6 @@ public class SatelliteSetting extends RestrictedDashboardFragment { @Override public void onCreate(@NonNull Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - // In case carrier roaming satellite is not supported, do nothing. - if (!Flags.carrierEnabledSatelliteFlag()) { - Log.d(TAG, "SatelliteSettings: satellite feature is not supported, do nothing."); - finish(); - return; - } - mActivity = getActivity(); mSatelliteManager = mActivity.getSystemService(SatelliteManager.class); diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java index f7f4fc09c3c..c81129708ec 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java @@ -41,7 +41,6 @@ import androidx.lifecycle.LifecycleOwner; 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; @@ -90,11 +89,6 @@ public class SatelliteSettingPreferenceController extends @Override public int getAvailabilityStatus(int subId) { - if (!Flags.carrierEnabledSatelliteFlag()) { - logd("getAvailabilityStatus() : carrierEnabledSatelliteFlag is disabled"); - return UNSUPPORTED_ON_DEVICE; - } - if (mSatelliteManager == null) { return UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java index 6218e055038..18ebf6c0888 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java @@ -66,10 +66,6 @@ public class SatelliteSettingsPreferenceCategoryController @Override public int getAvailabilityStatus(int subId) { - if (!com.android.internal.telephony.flags.Flags.carrierEnabledSatelliteFlag()) { - return UNSUPPORTED_ON_DEVICE; - } - if (mSatelliteManager == null) { return UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index a786fa58255..c1d47234a29 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -51,7 +51,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.Phone; -import com.android.internal.telephony.flags.Flags; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; @@ -719,10 +718,6 @@ public class WifiCallingSettingsForSub extends DashboardFragment * {@code false} otherwise. */ private boolean overrideWfcRoamingModeWhileUsingNtn() { - if (!Flags.carrierEnabledSatelliteFlag()) { - return false; - } - TelephonyManager tm = getTelephonyManagerForSub(mSubId); ServiceState serviceState = tm.getServiceState(); if (serviceState == null) { diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index 283083e112c..08d8a6fd9ee 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -54,7 +54,6 @@ import androidx.lifecycle.LifecycleOwner; 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.ims.MockWifiCallingQueryImsState; @@ -173,7 +172,6 @@ public class WifiCallingSettingsForSubTest { mFragment.onAttach(mContext); mFragment.onCreate(null); mFragment.onActivityCreated(null); - mSetFlagsRule.disableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG); } private void setDefaultCarrierConfigValues() { @@ -247,7 +245,6 @@ public class WifiCallingSettingsForSubTest { @Test public void onResume_overrideWfcRoamingModeWhileUsingNTN_shouldDisableWfcRoaming() { - mSetFlagsRule.enableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG); mBundle.putBoolean( CarrierConfigManager.KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false); mBundle.putBoolean(CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, true); diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java index 5a0456d22d5..16a22cdb937 100644 --- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java @@ -48,7 +48,6 @@ import androidx.test.annotation.UiThreadTest; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.internal.telephony.flags.Flags; import com.android.settings.network.CarrierConfigCache; import org.junit.Before; @@ -93,7 +92,6 @@ public class SatelliteSettingsPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG) public void getAvailabilityStatus_noSatellite_returnUnsupported() { when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null); mController = new SatelliteSettingPreferenceController(mContext, KEY); @@ -105,7 +103,6 @@ public class SatelliteSettingsPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG) public void getAvailabilityStatus_carrierIsNotSupport_returnUnavailable() { mCarrierConfig.putBoolean( CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, @@ -118,7 +115,6 @@ public class SatelliteSettingsPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG) public void getAvailabilityStatus_connectTypeIsManualButUnavailable_returnUnavailable() { mCarrierConfig.putBoolean( CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, @@ -136,7 +132,6 @@ public class SatelliteSettingsPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG) public void getAvailabilityStatus_connectTypeIsManualAndAvailable_returnAvailable() { mCarrierConfig.putBoolean( CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, @@ -154,7 +149,6 @@ public class SatelliteSettingsPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG) public void getAvailabilityStatus_connectTypeIsAuto_returnAvailable() { mCarrierConfig.putBoolean( CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,