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

Commit ba29424f authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY"

parents a82788f5 a381196b

src/com/android/settings/ResetNetwork.java

+3 −4
Original line number Diff line number Diff line
@@ -40,11 +40,9 @@ import android.widget.ArrayAdapter; 
import android.widget.Button;

import android.widget.CheckBox;

import android.widget.Spinner;

import android.widget.TextView;



import androidx.annotation.VisibleForTesting;



import com.android.internal.telephony.PhoneConstants;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
@@ -121,7 +119,8 @@ public class ResetNetwork extends InstrumentedFragment { 
        if (mSubscriptions != null && mSubscriptions.size() > 0) {

            int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();

            SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);

            args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId());

            args.putInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                    subscription.getSubscriptionId());

        }

        args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA,

                mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked());

src/com/android/settings/ResetNetworkConfirm.java

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.widget.Toast; 
import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;



import com.android.internal.telephony.PhoneConstants;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;

import com.android.settings.network.ApnSettings;
@@ -250,7 +249,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 


        Bundle args = getArguments();

        if (args != null) {

            mSubId = args.getInt(PhoneConstants.SUBSCRIPTION_KEY,

            mSubId = args.getInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);

            mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);

        }