Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" (bb8841c2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ResetNetwork.java

+6 −7

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());
		@@ -170,13 +169,13 @@ public class ResetNetwork extends InstrumentedFragment {
		if (mSubscriptions != null && mSubscriptions.size() > 0) {
		// Get the default subscription in the order of data, voice, sms, first up.
		int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();
		if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
		if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
		defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId();
		}
		if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
		if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
		defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId();
		}
		if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
		if (!SubscriptionManager.isUsableSubscriptionId(defaultSubscription)) {
		defaultSubscription = SubscriptionManager.getDefaultSubscriptionId();
		}

src/com/android/settings/ResetNetworkConfirm.java

+2 −3

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;
		@@ -199,7 +198,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
		private void restoreDefaultApn(Context context) {
		Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);

		if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
		if (SubscriptionManager.isUsableSubscriptionId(mSubId)) {
		uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId));
		}

		@@ -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);
		}