Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev

Browse Source 
* changes:
  Fix bug removing all windows that belong to a display.
  Add some missing debug output.
This commit is contained in:
Jeff Brown
2012-10-02 17:07:45 -07:00
committed by Android (Google) Code Review
parent 5cf72e11b6 cb882f90e4
commit 031e9d2e21
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/display/LogicalDisplay.java
View File

@@ -299,7 +299,9 @@ final class LogicalDisplay {
} }
public void dumpLocked(PrintWriter pw) { public void dumpLocked(PrintWriter pw) {
pw.println("mDisplayId=" + mDisplayId);
pw.println("mLayerStack=" + mLayerStack); pw.println("mLayerStack=" + mLayerStack);
pw.println("mHasContent=" + mHasContent);
pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null ? pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null ?
mPrimaryDisplayDevice.getNameLocked() : "null")); mPrimaryDisplayDevice.getNameLocked() : "null"));
pw.println("mBaseDisplayInfo=" + mBaseDisplayInfo); pw.println("mBaseDisplayInfo=" + mBaseDisplayInfo);

4
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -10870,8 +10870,8 @@ public class WindowManagerService extends IWindowManager.Stub
final DisplayContent displayContent = getDisplayContentLocked(displayId); final DisplayContent displayContent = getDisplayContentLocked(displayId);
mDisplayContents.delete(displayId); mDisplayContents.delete(displayId);
WindowList windows = displayContent.getWindowList(); WindowList windows = displayContent.getWindowList();
for (int i = windows.size() - 1; i >= 0; --i) { while (!windows.isEmpty()) {
final WindowState win = windows.get(i); final WindowState win = windows.get(windows.size() - 1);
removeWindowLocked(win.mSession, win); removeWindowLocked(win.mSession, win);
} }
mAnimator.removeDisplayLocked(displayId); mAnimator.removeDisplayLocked(displayId);