From 90da5e54482fd513ab73bbcfce9f55312d0c96f7 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Fri, 15 Apr 2016 10:58:37 -0700 Subject: [PATCH] Always assign layer when restacking special windows. In assignAndIncreaseLayerIfNeeded we need to always restack the special windows, even if we are stacking them downwards, otherwise they could be left at too high of a value from a previous pass. This check was added by me originally, as a now revealed poorly thought out attempt to avoid changing existing behavior too much. Bug: 28139028 Change-Id: I305499e194f2c6bcf7a38c80af1e64bd1fc20943 --- .../core/java/com/android/server/wm/WindowLayersController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java index 6bdcd42ee0814..0217c094ba837 100644 --- a/services/core/java/com/android/server/wm/WindowLayersController.java +++ b/services/core/java/com/android/server/wm/WindowLayersController.java @@ -218,7 +218,7 @@ public class WindowLayersController { } private int assignAndIncreaseLayerIfNeeded(WindowState win, int layer) { - if (win != null && layer > win.mLayer) { + if (win != null) { assignAnimLayer(win, layer); // Make sure we leave space inbetween normal windows for dims and such. layer += WINDOW_LAYER_MULTIPLIER;