commit 60de630feef2e6e249da3133b934329586f8d20b
author Jiashen Wang <jiashenwang@google.com> Thu Dec 17 17:44:31 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 17 17:44:31 2020 +0000
tree 6397b23c97efd67748f45fa252cbeef349510744
parent 0968b8603e156f2f60f05f348c0a2982fe85493b
parent c1ed4d548551ed101056459d0c36e6f9607baf62

Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev

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