commit db6c556daea9fcf8aaeea8cacb5d8c29d0b406e7
author Craig Mautner <cmautner@google.com> Wed Mar 06 18:43:55 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 06 18:43:55 2013 +0000
tree a23682fad41a856878a583e9853aa29d22351d13
parent 3eb3774f8e54a6f43dcf4f27e1b7a62676791ff6
parent cc947fdc2decb83a70484bd0f831c58cc0346657

am cc947fdc: Merge "Add window leak check and possible recovery." into jb-mr2-dev

* commit 'cc947fdc2decb83a70484bd0f831c58cc0346657':
  Add window leak check and possible recovery.

services/java/com/android/server/wm/WindowState.java

diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
index a0ed530..506fcec 100644
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -997,6 +997,9 @@
                     Slog.i(TAG, "WIN DEATH: " + win);
                     if (win != null) {
                         mService.removeWindowLocked(mSession, win);
+                    } else if (WindowState.this.mHasSurface) {
+                        Slog.e(TAG, "!!! LEAK !!! Window removed but surface still valid.");
+                        mService.removeWindowLocked(mSession, WindowState.this);
                     }
                 }
             } catch (IllegalArgumentException ex) {