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

am 1c48e302: am a7a99981: Merge "Fix Presentation window is removed on stack change"

Browse Source 
* commit '1c48e3029b41efea764520fee32c9085d1162a24':
  Fix Presentation window is removed on stack change
This commit is contained in:
Craig Mautner
2014-11-26 18:14:22 +00:00
committed by Android Git Automerger
parent b448862981 1c48e3029b
commit dae55017d8
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -4878,8 +4878,19 @@ public class WindowManagerService extends IWindowManager.Stub
if (NW > 0) { if (NW > 0) {
mWindowsChanged = true; mWindowsChanged = true;
} }
int targetDisplayId = -1;
Task targetTask = mTaskIdToTask.get(token.appWindowToken.groupId);
if (targetTask != null) {
DisplayContent targetDisplayContent = targetTask.getDisplayContent();
if (targetDisplayContent != null) {
targetDisplayId = targetDisplayContent.getDisplayId();
}
}
for (int i = 0; i < NW; i++) { for (int i = 0; i < NW; i++) {
WindowState win = windows.get(i); WindowState win = windows.get(i);
if (targetDisplayId != -1 && win.getDisplayId() != targetDisplayId) {
continue;
}
if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG, "Tmp removing app window " + win); if (DEBUG_WINDOW_MOVEMENT) Slog.v(TAG, "Tmp removing app window " + win);
win.getWindowList().remove(win); win.getWindowList().remove(win);
int j = win.mChildWindows.size(); int j = win.mChildWindows.size();