From a381196b8b931a4ec83ba30dc60e2a4eaf086e48 Mon Sep 17 00:00:00 2001 From: tom hsu Date: Tue, 14 Jan 2020 14:46:09 +0800 Subject: [PATCH] Remove reference of Phoneconstants for SUBSCRIPTION_KEY - use SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead of it Test: make Test: m RunSettingsRoboTests Change-Id: Ic635b11c995077ebf1e143d9562b100d7730fe52 --- src/com/android/settings/ResetNetwork.java | 7 +++---- src/com/android/settings/ResetNetworkConfirm.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index e2adcc71c22..733d7febbf1 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -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,10 +119,11 @@ 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()); + mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked()); new SubSettingLauncher(getContext()) .setDestination(ResetNetworkConfirm.class.getName()) .setArguments(args) diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index f4b20eb73d6..6856a5a140e 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -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); }