commit c1ed4d548551ed101056459d0c36e6f9607baf62
author Jiashen Wang <jiashenwang@google.com> Mon Dec 14 22:44:41 2020 -0800
committer Jiashen Wang <jiashenwang@google.com> Mon Dec 14 22:44:41 2020 -0800
tree 9ed437cc7cd81b121b2a42018251bf8e1cbbc1b1
parent 4dd011b3c70dedbeb6f56da77d367b4839d43298

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

src/com/android/settings/ResetNetworkConfirm.java

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 6856a5a..784ffa7 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -87,6 +87,7 @@
 
         @Override
         protected Boolean doInBackground(Void... params) {
+            boolean isResetSucceed = true;
             ConnectivityManager connectivityManager = (ConnectivityManager)
                     mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivityManager != null) {
@@ -101,6 +102,10 @@
 
             p2pFactoryReset(mContext);
 
+            if (mEraseEsim) {
+                isResetSucceed = RecoverySystem.wipeEuiccData(mContext, mPackageName);
+            }
+
             TelephonyManager telephonyManager = (TelephonyManager)
                     mContext.getSystemService(TelephonyManager.class)
                             .createForSubscriptionId(mSubId);
@@ -125,11 +130,7 @@
             }
 
             restoreDefaultApn(mContext);
-            if (mEraseEsim) {
-                return RecoverySystem.wipeEuiccData(mContext, mPackageName);
-            } else {
-                return true;
-            }
+            return isResetSucceed;
         }
 
         @Override