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

Commit c1ed4d54 authored by Jiashen Wang's avatar Jiashen Wang
Browse files

Move eSIM reset before telephony manager reset in ResetNetworkConfirm 

TelephonyManager#resetSettings triggers modem restart. It could cause
eSIM reset failure since Modem is not available. In order to resolve
this issue, we move eSIM reset befor telephony manager reset.
Bug: 175239934
Test: Manually tested

Change-Id: I44644c67577469898726ba07dcd6b68b3fb73b2a
parent 4dd011b3

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