Merge "Clean up aconfig flag carrier_enabled_satellite_flag" into main
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 4ae51ab..5b2eba2 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -44,7 +44,6 @@
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 @@
*/
@VisibleForTesting
protected List<String> 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 bc10abb..f99011d 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.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 @@
@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 f7f4fc0..c811297 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.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 @@
@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 2950247..85b4d58 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
@@ -89,10 +89,6 @@
@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 a786fa5..c1d4723 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -51,7 +51,6 @@
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 @@
* {@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 283083e..08d8a6f 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.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 @@
mFragment.onAttach(mContext);
mFragment.onCreate(null);
mFragment.onActivityCreated(null);
- mSetFlagsRule.disableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG);
}
private void setDefaultCarrierConfigValues() {
@@ -247,7 +245,6 @@
@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 5a0456d..16a22cd 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.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 @@
}
@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 @@
}
@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 @@
}
@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 @@
}
@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 @@
}
@Test
- @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
public void getAvailabilityStatus_connectTypeIsAuto_returnAvailable() {
mCarrierConfig.putBoolean(
CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,