Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev

* changes:
  Fix bug removing all windows that belong to a display.
  Add some missing debug output.

2 files changed, 4 insertions, 2 deletions

diff --git a/services/java/com/android/server/display/LogicalDisplay.java b/services/java/com/android/server/display/LogicalDisplay.java
index f4cb84da9eb4..c4b749c3e90b 100644
--- a/services/java/com/android/server/display/LogicalDisplay.java
+++ b/services/java/com/android/server/display/LogicalDisplay.java
@@ -299,7 +299,9 @@ final class LogicalDisplay {
     }
 
     public void dumpLocked(PrintWriter pw) {
+        pw.println("mDisplayId=" + mDisplayId);
         pw.println("mLayerStack=" + mLayerStack);
+        pw.println("mHasContent=" + mHasContent);
         pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null ?
                 mPrimaryDisplayDevice.getNameLocked() : "null"));
         pw.println("mBaseDisplayInfo=" + mBaseDisplayInfo);
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index ae805c38c7e5..8fb1459cd7c9 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -10870,8 +10870,8 @@ public class WindowManagerService extends IWindowManager.Stub
         final DisplayContent displayContent = getDisplayContentLocked(displayId);
         mDisplayContents.delete(displayId);
         WindowList windows = displayContent.getWindowList();
-        for (int i = windows.size() - 1; i >= 0; --i) {
-            final WindowState win = windows.get(i);
+        while (!windows.isEmpty()) {
+            final WindowState win = windows.get(windows.size() - 1);
             removeWindowLocked(win.mSession, win);
         }
         mAnimator.removeDisplayLocked(displayId);