Merge "Fix InputMonitor.updateInputWindowsLw"

2016-12-14 00:37:04 +00:00
parent a0207a16a4 2e96c63c4c
commit 201708ad89
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -591,8 +591,6 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {

        private void updateInputWindows(boolean inDrag) {

-            clearInputWindowHandlesLw();
-
            // TODO: multi-display
            navInputConsumer = getInputConsumer(INPUT_CONSUMER_NAVIGATION, DEFAULT_DISPLAY);
            pipInputConsumer = getInputConsumer(INPUT_CONSUMER_PIP, DEFAULT_DISPLAY);
@@ -614,6 +612,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {

            // Send windows to native code.
            mService.mInputManager.setInputWindows(mInputWindowHandles);
+
+            clearInputWindowHandlesLw();
        }

        @Override