commit af06b797c44ab79536bc47395ba55b943d83bf5f
author Patrick Williams <pdwilliams@google.com> Thu Feb 16 17:46:22 2023 -0600
committer Patrick Williams <pdwilliams@google.com> Thu Feb 23 17:04:42 2023 +0000
tree 55482f76152dc0b404ca21c1f19b5b13862bb363
parent 89d7a1271f74e90e7bde519d800ffcda359394eb

Fix WindowInfosListenerTest

Fixes a race condition where the WindowInfo vector checked may not
contain the updated window on the first pass.

Bug: 269522974
Test: atest WindowInfosListenerTest
Change-Id: I013955dd1c89858190b519c2980909e2e7e45a24
(cherry picked from commit 4c766ae50ce641672158c19eda4613a5e64baf47)

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index c91ad49..28b7dd6 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3576,6 +3576,10 @@
         });
     }
 
+    if (transactionFlags & eInputInfoUpdateNeeded) {
+        mUpdateInputInfo = true;
+    }
+
     doCommitTransactions();
 }
 
@@ -7567,8 +7571,9 @@
 }
 
 status_t SurfaceFlinger::addWindowInfosListener(
-        const sp<IWindowInfosListener>& windowInfosListener) const {
+        const sp<IWindowInfosListener>& windowInfosListener) {
     mWindowInfosListenerInvoker->addWindowInfosListener(windowInfosListener);
+    setTransactionFlags(eInputInfoUpdateNeeded);
     return NO_ERROR;
 }