Misc change about ResetNetworkConfirm

- Modify reset network layout
- Merge changes from Qt-dev

Fixes:131127455
Test: manual
Change-Id: I6d63a821016588ea81a04ef792111c2b96dfe7fe

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index f457bbc461..beb0528f6a 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -72,6 +72,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
     @VisibleForTesting Activity mActivity;
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     private ProgressDialog mProgressDialog;
+    private AlertDialog mAlertDialog;
 
     /**
      * Async task used to do all reset task. If error happens during
@@ -141,7 +142,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
                 Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                         .show();
             } else {
-                new AlertDialog.Builder(mContext)
+                mAlertDialog = new AlertDialog.Builder(mContext)
                         .setTitle(R.string.reset_esim_error_title)
                         .setMessage(R.string.reset_esim_error_msg)
                         .setPositiveButton(android.R.string.ok, null /* listener */)
@@ -265,6 +266,12 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
             mResetNetworkTask.cancel(true /* mayInterruptIfRunning */);
             mResetNetworkTask = null;
         }
+        if (mProgressDialog != null) {
+            mProgressDialog.dismiss();
+        }
+        if (mAlertDialog != null) {
+            mAlertDialog.dismiss();
+        }
         super.onDestroy();
     }