Merge "Dismiss immediately to maintain consistent state."

2 files changed, 6 insertions, 7 deletions

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 634fa30c1c40..cda2c5f3b7c5 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -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();
@@ -334,7 +335,7 @@ public class Dialog implements DialogInterface, Window.Callback,
             mWindow.closeAllPanels();
             onStop();
             mShowing = false;
-            
+
             sendDismissMessage();
         }
     }
diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index 6bcf863aa6e6..f7b85cc7436c 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -335,15 +335,13 @@ public final class WindowManagerGlobal {
             }
         }
         root.die(immediate);
+        if (view != null) {
+            view.assignParent(null);
+        }
     }
 
     void doRemoveView(ViewRootImpl root) {
         synchronized (mLock) {
-            final View view = root.getView();
-            if (view != null) {
-                view.assignParent(null);
-            }
-
             final int index = mRoots.indexOf(root);
             if (index >= 0) {
                 mRoots.remove(index);