commit 02701dd8b1a464ebaf204730bf22e986e93dc80a
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 08 10:03:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 08 10:03:46 2022 +0000
tree 1a76b4a0128bba6ef9fc216c0ec06ad872a42f31
parent e75d9ee3e9a818af1c85cb0b567851d1c490950b
parent d6d6c5c020af2b1fb36b1959375480124264678f

Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I686382ad702fb8e9fc090ea8441f9a1b3cae0716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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();