Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 031e9d2e authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev 

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

services/java/com/android/server/display/LogicalDisplay.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

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

+2 −2
Original line number Diff line number Diff line
@@ -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);