commit 4b506ad1fc8b13058265e54f0f7f509c0535bbb1
author Valerie Hau <vhau@google.com> Tue Jun 16 17:14:43 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 16 17:14:43 2020 +0000
tree de323df37a6c4fc51de1f51cd4bd325ad89135e2
parent a9ef659a8bc5fbde5eabf4047c0069251d3e3a2b
parent 47826a7d00b08287c82e63b96f5fbb76dce524b8

Merge "Run transaction handling whenever you flush" into rvc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index b73361b..01b84c9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2017,8 +2017,9 @@
 
     bool flushedATransaction = flushTransactionQueues();
 
-    bool runHandleTransaction = transactionFlags &&
-            ((transactionFlags != eTransactionFlushNeeded) || flushedATransaction);
+    bool runHandleTransaction =
+            (transactionFlags && (transactionFlags != eTransactionFlushNeeded)) ||
+            flushedATransaction;
 
     if (runHandleTransaction) {
         handleTransaction(eTransactionMask);