Merge "Settings: Fix sometimes reset progress dialog not dismissed" (d6d6c5c0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ResetNetworkConfirm.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment {

		@Override
		protected void onPostExecute(Boolean succeeded) {
		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();