Merge "[Settings] Remove IMS factoryReset()"

This commit is contained in:
Bonian Chen
2020-01-08 15:38:05 +00:00
committed by Android (Google) Code Review

View File

@@ -47,12 +47,10 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.ims.ImsManager;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.ApnSettings;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
@@ -127,8 +125,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
}
}
ImsManager.getInstance(mContext,
SubscriptionUtil.getPhoneId(mContext, mSubId)).factoryReset();
restoreDefaultApn(mContext);
if (mEraseEsim) {
return RecoverySystem.wipeEuiccData(mContext, mPackageName);