From f12f9d3ded0d947b1b0c9fd71cf75bdb83f5005a Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Thu, 1 Mar 2018 15:24:36 -0800 Subject: [PATCH] Assign leash layer when starting animations. Currently AppWindowToken does this but WindowContainer does not ending in a situation where WindowState level animations can cause child windows to be ordered below the IME when they would otherwise be above. I couldn't find any reason for the assignLayer call that was here, as the parent won't view the leash as a child from the WindowContainer perspective and thus assignment will never happen. I've just replaced the old call with the new layer assignment. Bug: 72173720 Test: Manual. go/wm-smoke Change-Id: Iba57158645e27c2ff74ce6e0b59cd15b15bfe3f5 --- services/core/java/com/android/server/wm/WindowContainer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index b7525c007f8d8..5ae4dc5636f07 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -1142,11 +1142,13 @@ class WindowContainer extends ConfigurationContainer< @Override public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) { + mLastLayer = -1; reassignLayer(t); } @Override public void onAnimationLeashDestroyed(Transaction t) { + mLastLayer = -1; reassignLayer(t); }