am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev

* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 07583fdd4974..12d451380c3d 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -79,7 +79,7 @@ import java.lang.ref.WeakReference;
  * </div>
  */
 public class Dialog implements DialogInterface, Window.Callback,
-        KeyEvent.Callback, OnCreateContextMenuListener {
+        KeyEvent.Callback, OnCreateContextMenuListener, Window.OnWindowDismissedCallback {
     private static final String TAG = "Dialog";
     private Activity mOwnerActivity;
     
@@ -165,6 +165,7 @@ public class Dialog implements DialogInterface, Window.Callback,
         Window w = PolicyManager.makeNewWindow(mContext);
         mWindow = w;
         w.setCallback(this);
+        w.setOnWindowDismissedCallback(this);
         w.setWindowManager(mWindowManager, null, null);
         w.setGravity(Gravity.CENTER);
         mListenersHandler = new ListenersHandler(this);
@@ -708,6 +709,8 @@ public class Dialog implements DialogInterface, Window.Callback,
     public void onDetachedFromWindow() {
     }
 
+    /** @hide */
+    @Override
     public void onWindowDismissed() {
         dismiss();
     }