diff options
| author | Craig Mautner <cmautner@google.com> | 2013-08-27 21:20:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-27 21:20:52 +0000 |
| commit | 61f0f9ada51a6718075acfe7fafbb9954f38e980 (patch) | |
| tree | 23e0eed12d7fa7f20b145482461a663c66ae0922 | |
| parent | ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3 (diff) | |
| parent | 018be3da7b2154499f644f72145f72454fa9fe15 (diff) | |
| download | frameworks_base-61f0f9ada51a6718075acfe7fafbb9954f38e980.zip frameworks_base-61f0f9ada51a6718075acfe7fafbb9954f38e980.tar.gz frameworks_base-61f0f9ada51a6718075acfe7fafbb9954f38e980.tar.bz2 | |
Merge "When adding a window evaluate all tasks." into klp-dev
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 3e5787d..34d8973 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -943,7 +943,7 @@ public class WindowManagerService extends IWindowManager.Stub // order of applications. WindowState pos = null; - final ArrayList<Task> tasks = win.getStack().getTasks(); + final ArrayList<Task> tasks = displayContent.getTasks(); int taskNdx; int tokenNdx = -1; for (taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) { @@ -7983,11 +7983,8 @@ public class WindowManagerService extends IWindowManager.Stub int curLayer = 0; int i; - if (DEBUG_LAYERS) { - RuntimeException here = new RuntimeException("here"); - here.fillInStackTrace(); - Slog.v(TAG, "Assigning layers", here); - } + if (DEBUG_LAYERS) Slog.v(TAG, "Assigning layers based on windows=" + windows, + new RuntimeException("here").fillInStackTrace()); boolean anyLayerChanged = false; |