am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev
* commit '564e8e6f548951c9fe5825aaad327b9ffbeece82':
Ensure correct window ordering.
diff --git a/services/java/com/android/server/wm/DisplayContent.java b/services/java/com/android/server/wm/DisplayContent.java
index beeb899..2798104 100644
--- a/services/java/com/android/server/wm/DisplayContent.java
+++ b/services/java/com/android/server/wm/DisplayContent.java
@@ -162,6 +162,7 @@
void moveStack(TaskStack stack, boolean toTop) {
mStackHistory.remove(stack);
mStackHistory.add(toTop ? mStackHistory.size() : 0, stack);
+ mService.moveStackWindowsLocked(stack);
}
public boolean isPrivate() {
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 680b44e..80c50cc 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -4715,7 +4715,7 @@
}
}
- private void moveStackWindowsLocked(TaskStack stack) {
+ void moveStackWindowsLocked(TaskStack stack) {
DisplayContent displayContent = stack.getDisplayContent();
// First remove all of the windows from the list.
@@ -4782,7 +4782,6 @@
}
stack.moveTaskToTop(task);
displayContent.moveStack(stack, true);
- moveStackWindowsLocked(stack);
}
} finally {
Binder.restoreCallingIdentity(origId);