commit c854c108a2e7f12257607240fbf142552f26e7c5
author Bill Yi <byi@google.com> Fri Apr 08 18:08:25 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 08 18:08:25 2022 +0000
tree 53cd93421f95a71eaba92a8e38c25d0971d3e89d
parent d6d6c5c020af2b1fb36b1959375480124264678f
parent 35525a56171ff6f2cc5843098ada03ec36c9f6e6

Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE"

src/com/android/settings/ResetNetworkConfirm.java

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index eff487b..30d159b 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -150,7 +150,10 @@
 
         @Override
         protected void onPostExecute(Boolean succeeded) {
-            mProgressDialog.dismiss();
+            if (mProgressDialog != null && mProgressDialog.isShowing()) {
+                mProgressDialog.dismiss();
+            }
+
             if (succeeded) {
                 Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                         .show();
@@ -189,6 +192,12 @@
                 }
             }
 
+            // Should dismiss the progress dialog firstly if it is showing
+            // Or not the progress dialog maybe not dismissed in fast clicking.
+            if (mProgressDialog != null && mProgressDialog.isShowing()) {
+                mProgressDialog.dismiss();
+            }
+
             mProgressDialog = getProgressDialog(mActivity);
             mProgressDialog.show();