commit 3c9a15cfa5a6b54ae020c1b7d4bd777b04bf35e4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 11 22:16:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 11 22:16:22 2020 +0000
tree fe6a0caa074390af2cb762ff58cdb1425b1f6cb8
parent a565b79bce5bc1f8f95ba7f0d32c879e63662417
parent ae3238b96aed54101a278ba57d1e549bfbc7fdc7

Merge "SurfaceFlinger: Ignore mInputDirty if syncing input-windows." into rvc-dev am: dc5f0ff4eb am: 0dcd94105f am: ae3238b96a

Change-Id: I63577acef72a2871ded16b4accd6b626b232c1c6

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 29fe5d9..91b1c73 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2800,7 +2800,7 @@
     // input changes but all input changes will spring from these transactions
     // so the cache is safe but not optimal. It seems like it might be annoyingly
     // costly to cache and comapre the actual InputWindowHandle vector though.
-    if (!mInputDirty) {
+    if (!mInputDirty && !mInputWindowCommands.syncInputWindows) {
         return;
     }