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

2013-03-06 18:40:48 +00:00
parent 67df64b3a4 a99764e597
commit cc947fdc2d
1 changed files with 3 additions and 0 deletions
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@ -997,6 +997,9 @@ final class WindowState implements WindowManagerPolicy.WindowState {
                    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) {