Merge "[Settings] Remove IMS factoryReset()"

am: bf3aaf0f37

Change-Id: I56c8a7b23e97bf13e44faedd9a3aac898f3c11e9
This commit is contained in:
Bonian Chen
2020-01-08 10:09:32 -08:00
committed by android-build-merger

View File

@@ -47,7 +47,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.android.ims.ImsManager;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
@@ -126,8 +125,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
} }
} }
ImsManager.getInstance(mContext,
SubscriptionManager.getPhoneId(mSubId)).factoryReset();
restoreDefaultApn(mContext); restoreDefaultApn(mContext);
if (mEraseEsim) { if (mEraseEsim) {
return RecoverySystem.wipeEuiccData(mContext, mPackageName); return RecoverySystem.wipeEuiccData(mContext, mPackageName);