Merge "Ensure input transactions are applied before injecting input"

diff --cc services/core/java/com/android/server/wm/InputMonitor.java
index f85fdb6,b6e747a..d3dba90
--- 1/services/core/java/com/android/server/wm/InputMonitor.java
--- 2/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@@ -433,9 -436,14 +442,14 @@@ final class InputMonitor 
                  wallpaperInputConsumer.show(mInputTransaction, 0);
              }
  
-             mDisplayContent.scheduleAnimation();
+             if (mApplyImmediately) {
+                 mInputTransaction.apply();
+             } else {
+                 mDisplayContent.getPendingTransaction().merge(mInputTransaction);
+                 mDisplayContent.scheduleAnimation();
+             }
  
 -            Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
 +            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
          }
  
          @Override

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge