Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac636e96 authored by Jiashen Wang's avatar Jiashen Wang Committed by Automerger Merge Worker
Browse files

Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm"... 

Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev am: 60de630f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa4ad8d86ec4abe910b5eff52e406df0ec302766
parents bb5688ea 60de630f

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