Remove reference of Phoneconstants for SUBSCRIPTION_KEY

- use SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead of it

Test: make
Test: m RunSettingsRoboTests
Merged-In: Ic635b11c995077ebf1e143d9562b100d7730fe52
Change-Id: I42cbf1074af3b325ebb37281efd505954a2ca25c

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