Merge "Fix WM input limitations on secondary displays (1/N)"

2018-07-26 12:06:28 +00:00
parent caf15ef80b 95b38a906f
commit f618905a6e
16 changed files with 415 additions and 328 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -909,7 +909,7 @@ public final class SystemServer {
            }

            traceBeginAndSlog("StartInputManager");
-            inputManager.setWindowManagerCallbacks(wm.getInputMonitor());
+            inputManager.setWindowManagerCallbacks(wm.getInputManagerCallback());
            inputManager.start();
            traceEnd();