commit 14f49cd4d3566751258de3b050c2aea181fea9fc
author Rob Carr <racarr@google.com> Mon Mar 09 17:06:29 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 17:06:29 2020 +0000
tree d64840258be8d31186c0b14c3e997d02328c069e
parent 76f7f29f6887207a2179ba062eb8dfeb4d4e0a40
parent 9a2cc990b0a4f7670b38d28913a5ef0e809ffe4f

Merge "SurfaceFlinger: Ensure syncInputWindows is processed." into rvc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9653661..6ec521a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2808,7 +2808,7 @@
 }
 
 void SurfaceFlinger::commitInputWindowCommands() {
-    mInputWindowCommands = mPendingInputWindowCommands;
+    mInputWindowCommands.merge(mPendingInputWindowCommands);
     mPendingInputWindowCommands.clear();
 }
 
@@ -5779,6 +5779,7 @@
     Mutex::Autolock _l(mStateLock);
 
     mPendingSyncInputWindows = false;
+
     mTransactionCV.broadcast();
 }