Merge "Dismiss immediately to maintain consistent state." (6a7e5c28) · Commits · e / os / android_frameworks_base

core/java/android/app/Dialog.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -306,6 +306,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		* method to do cleanup when the dialog is dismissed, instead implement
		* that in {@link #onStop}.
		*/
		@Override
		public void dismiss() {
		if (Looper.myLooper() == mHandler.getLooper()) {
		dismissDialog();
		@@ -325,7 +326,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		}

		try {
		mWindowManager.removeView(mDecor);
		mWindowManager.removeViewImmediate(mDecor);
		} finally {
		if (mActionMode != null) {
		mActionMode.finish();

+3 −5

Original line number	Diff line number	Diff line
		@@ -335,15 +335,13 @@ public final class WindowManagerGlobal {
		}
		}
		root.die(immediate);
		}

		void doRemoveView(ViewRootImpl root) {
		synchronized (mLock) {
		final View view = root.getView();
		if (view != null) {
		view.assignParent(null);
		}
		}

		void doRemoveView(ViewRootImpl root) {
		synchronized (mLock) {
		final int index = mRoots.indexOf(root);
		if (index >= 0) {
		mRoots.remove(index);