am 2db084fa: Merge "Dialog not dismissed when tearing down dialog fragment." into jb-dev (2e353b35) · Commits · e / os / android_frameworks_base

core/java/android/app/Dialog.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.util.Log;
		import android.util.TypedValue;
		@@ -297,8 +298,12 @@ public class Dialog implements DialogInterface, Window.Callback,
		* that in {@link #onStop}.
		*/
		public void dismiss() {
		if (Looper.myLooper() == mHandler.getLooper()) {
		dismissDialog();
		} else {
		mHandler.post(mDismissAction);
		}
		}

		void dismissDialog() {
		if (mDecor == null \|\| !mShowing) {