Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 796f631f authored by rambowang's avatar rambowang Committed by Rambo Wang
Browse files

Clean up 24Q3 aconfig flag reset_mobile_network_settings 

Bug: 271921464
Test: m -j
Flag: EXEMPT flag clean up
Change-Id: I13f9cf25263c1465860272d5891554088e174474
parent f9d76f5c

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,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",

src/com/android/settings/ResetNetwork.java

+4 −10
Original line number Diff line number Diff line
@@ -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,10 +152,8 @@ public class ResetNetwork extends InstrumentedFragment { 
            int subId = subscription.getSubscriptionId();

            request.setResetTelephonyAndNetworkPolicyManager(subId)

                    .setResetApn(subId);

            if (Flags.resetMobileNetworkSettings()) {

            request.setResetImsSubId(subId);

        }

        }

        if (mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()) {

            resetSims = true;

            request.setResetEsim(context.getPackageName()).writeIntoBundle(args);