diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index eff487b9348..30d159bbb04 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -150,7 +150,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment { @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 @@ public class ResetNetworkConfirm extends InstrumentedFragment { } } + // 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();