commit 7e25024758c2aff4b70024c70d931f81ad25cbd6
author Rob Carr <racarr@google.com> Fri Apr 15 18:52:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 15 18:52:02 2016 +0000
tree 9e13c1a385a9cf820da51a4167e2de69354ef814
parent 74870c441fde0aa141edca84f066d1ace4cf5db5
parent 90da5e54482fd513ab73bbcfce9f55312d0c96f7

Merge "Always assign layer when restacking special windows." into nyc-dev

services/core/java/com/android/server/wm/WindowLayersController.java

diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java
index 6bdcd42..0217c09 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 @@
     }
 
     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;