commit b8e78faf1c5173d8e2c1bd022c08506002de4f42
author Robert Carr <racarr@google.com> Tue Nov 28 13:07:58 2017 -0800
committer Robert Carr <racarr@google.com> Thu Nov 30 13:52:50 2017 -0800
tree dadb1f6f3556ca37bf8a5bcb74f410f0a2cbf27a
parent de59123c85ae53a14f79bed9249993b18004b92b

Fix small typo in IME assignment.

If we haven't found anything above the IME, then the IME
is at the TOP not at the bottom.

Bug: 69845283
Test: Manual
Change-Id: I57ab742ad1628a518afacbecb2fb447880b80155

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 41348ba..ca8ffca 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3574,7 +3574,9 @@
 
                 int layer = mService.mPolicy.getWindowLayerFromTypeLw(
                         wt.windowType, wt.mOwnerCanManageAppTokens);
-                if (needAssignIme && layer >= TYPE_INPUT_METHOD_DIALOG) {
+
+                if (needAssignIme && layer >= mService.mPolicy.getWindowLayerFromTypeLw(
+                                TYPE_INPUT_METHOD_DIALOG, true)) {
                     t.setRelativeLayer(imeContainer.getSurfaceControl(),
                             wt.getSurfaceControl(), -1);
                     needAssignIme = false;
@@ -3582,7 +3584,7 @@
             }
             if (needAssignIme) {
                 t.setRelativeLayer(imeContainer.getSurfaceControl(),
-                        getSurfaceControl(), Integer.MIN_VALUE);
+                        getSurfaceControl(), Integer.MAX_VALUE);
             }
         }
     }