diff --git a/Android.bp b/Android.bp index 575f0513273..8f7bd1befac 100644 --- a/Android.bp +++ b/Android.bp @@ -108,7 +108,6 @@ android_library { "fuelgauge-protos-lite", "settings-logtags", "statslog-settings", - "telephony_flags_core_java_lib", "setupdesign-lottie-loading-layout", "device_policy_aconfig_flags_lib", "keyboard_flags_lib", diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index f86e29f14d1..2178b603d1b 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -47,7 +47,6 @@ import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import com.android.internal.telephony.flags.Flags; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; import com.android.settings.network.ResetNetworkRestrictionViewBuilder; @@ -142,13 +141,10 @@ public class ResetNetwork extends InstrumentedFragment { Context context = getContext(); boolean resetSims = false; - // TODO(b/317276437) Simplify the logic once flag is released int resetOptions = ResetNetworkRequest.RESET_CONNECTIVITY_MANAGER - | ResetNetworkRequest.RESET_VPN_MANAGER; - if (Flags.resetMobileNetworkSettings()) { - resetOptions |= ResetNetworkRequest.RESET_IMS_STACK; - resetOptions |= ResetNetworkRequest.RESET_PHONE_PROCESS; - } + | ResetNetworkRequest.RESET_VPN_MANAGER + | ResetNetworkRequest.RESET_IMS_STACK + | ResetNetworkRequest.RESET_PHONE_PROCESS; ResetNetworkRequest request = new ResetNetworkRequest(resetOptions); if (mSubscriptions != null && mSubscriptions.size() > 0) { int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition(); @@ -156,9 +152,7 @@ public class ResetNetwork extends InstrumentedFragment { int subId = subscription.getSubscriptionId(); request.setResetTelephonyAndNetworkPolicyManager(subId) .setResetApn(subId); - if (Flags.resetMobileNetworkSettings()) { - request.setResetImsSubId(subId); - } + request.setResetImsSubId(subId); } if (mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()) { resetSims = true;