commit 3f0bc9af042dbaa03ac4cad23bd314dacf68492a
author Craig Mautner <cmautner@google.com> Wed Mar 06 18:46:21 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 06 18:46:21 2013 +0000
tree d6400c059f6919cd1a59847b50111e6a36746f2a
parent 4a682c2c8fb3d6e00a873d4c99c137c01a803f45
parent db6c556daea9fcf8aaeea8cacb5d8c29d0b406e7

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

* commit 'db6c556daea9fcf8aaeea8cacb5d8c29d0b406e7':
  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 b6e630a..ca6d2ca 100644
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -1003,6 +1003,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) {