summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-10-02 22:19:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-02 22:19:19 +0000
commit4aca4c1520549ae8b99986a47a08cde311058140 (patch)
tree2a9a6c30967eec7acac9995c8598fd6729527458 /services/java/com
parent913f87ef637fc1d9a006c543833b6815090b94e8 (diff)
parent85689b9f489133d26b7ddce0a68acecf8668f039 (diff)
downloadframeworks_base-4aca4c1520549ae8b99986a47a08cde311058140.zip
frameworks_base-4aca4c1520549ae8b99986a47a08cde311058140.tar.gz
frameworks_base-4aca4c1520549ae8b99986a47a08cde311058140.tar.bz2
Merge "Don't reorder windows on non-default display." into klp-dev
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/wm/WindowManagerService.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 713aeee..e625cae 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -7923,11 +7923,8 @@ public class WindowManagerService extends IWindowManager.Stub
}
final void rebuildAppWindowListLocked() {
- final int numDisplays = mDisplayContents.size();
- for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {
- final DisplayContent displayContent = mDisplayContents.valueAt(displayNdx);
- rebuildAppWindowListLocked(displayContent);
- }
+ // TODO: Multidisplay, when ActivityStacks and tasks exist on more than one display.
+ rebuildAppWindowListLocked(getDefaultDisplayContentLocked());
}
private void rebuildAppWindowListLocked(final DisplayContent displayContent) {