commit 2e8713ca15a144f1420710a5ec9a6d0d9cbc2761
author Rob Carr <racarr@google.com> Fri Apr 27 18:00:09 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 27 18:00:09 2018 +0000
tree 7e4c18804f16aba5768bf1c0d0dfac869763e885
parent c633be841bfb939d61edcb0bde077ab34c9f063c
parent bb5de66fa39d81f7c2a20ba6f949d8bedaec2211

Merge "Assign relative layer respecting cache." into pi-dev

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 4fd31ff..38fb30e 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3906,7 +3906,7 @@
      * with {@link #WindowState#assignLayer}
      */
     void assignRelativeLayerForImeTargetChild(SurfaceControl.Transaction t, WindowContainer child) {
-        t.setRelativeLayer(child.getSurfaceControl(), mImeWindowsContainers.getSurfaceControl(), 1);
+        child.assignRelativeLayer(t, mImeWindowsContainers.getSurfaceControl(), 1);
     }
 
     @Override