Commit 37584e23 authored Apr 04, 2018 by tiansiming [田思明] Committed by android-build-merger Apr 04, 2018

Merge "Merge "Modify isShowing method in Dialog" am: 46be1f15 am:...

Merge "Merge "Modify isShowing method in Dialog" am: 46be1f15 am: 4b38e958" into pi-dev-plus-aosp
am: fc6096a7

Change-Id: Ica07fe42146df2480e476543ac3372bdaf9e363c

parents 225de56e fc6096a7

core/java/android/app/Dialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		* @return Whether the dialog is currently showing.
		*/
		public boolean isShowing() {
		return mShowing;
		return mDecor == null ? false : mDecor.getVisibility() == View.VISIBLE;
		}

		/**