commit ceb72e8732945d7eb441b452433ffde0e0ed5694
author Ady Abraham <adyabr@google.com> Tue Jan 17 17:40:21 2023 -0800
committer Ady Abraham <adyabr@google.com> Wed Jan 18 01:44:07 2023 +0000
tree 7e7e647774f8208fcdef24500e4453090e129854
parent ae0b8d1d9bbada6795d81ab20f7470cb4f3cdc60

SF: fix a bug in isFrameActive

We should look at the value of layer_state_t::frameRateCompatibility only if layer_state_t::eFrameRateChanged changed.

Test: presubmit
Bug: 264952266
Change-Id: Ice3537cde6a91bacbe253d18faeef44433bcd982

services/surfaceflinger/TransactionState.h

diff --git a/services/surfaceflinger/TransactionState.h b/services/surfaceflinger/TransactionState.h
index 380301f..366b09d 100644
--- a/services/surfaceflinger/TransactionState.h
+++ b/services/surfaceflinger/TransactionState.h
@@ -91,7 +91,9 @@
         if (!displays.empty()) return true;
 
         for (const auto& state : states) {
-            if (state.state.frameRateCompatibility != ANATIVEWINDOW_FRAME_RATE_NO_VOTE) {
+            const bool frameRateChanged = state.state.what & layer_state_t::eFrameRateChanged;
+            if (!frameRateChanged ||
+                state.state.frameRateCompatibility != ANATIVEWINDOW_FRAME_RATE_NO_VOTE) {
                 return true;
             }
         }