Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev (60de630f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ResetNetworkConfirm.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {

		@Override
		protected Boolean doInBackground(Void... params) {
		boolean isResetSucceed = true;
		ConnectivityManager connectivityManager = (ConnectivityManager)
		mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
		if (connectivityManager != null) {
		@@ -101,6 +102,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment {

		p2pFactoryReset(mContext);

		if (mEraseEsim) {
		isResetSucceed = RecoverySystem.wipeEuiccData(mContext, mPackageName);
		}

		TelephonyManager telephonyManager = (TelephonyManager)
		mContext.getSystemService(TelephonyManager.class)
		.createForSubscriptionId(mSubId);
		@@ -125,11 +130,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
		}

		restoreDefaultApn(mContext);
		if (mEraseEsim) {
		return RecoverySystem.wipeEuiccData(mContext, mPackageName);
		} else {
		return true;
		}
		return isResetSucceed;
		}

		@Override