commit aabfce6962d30fa96cd612ec880e2c8ceca5e9b0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 08 00:50:42 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 08 00:50:42 2024 +0000
tree 026b1b4105fdbd99aca6ce069ac51f10d304e619
parent 00c0848d34b1a2dd15d79401ce6209f507713c98
parent 16490fdbfbf667784ffa22247e4e6fb36eaa1052

Merge "SF: do not wait for LastCompositeEventThread if it is not used" into main

services/surfaceflinger/Scheduler/Scheduler.h

diff --git a/services/surfaceflinger/Scheduler/Scheduler.h b/services/surfaceflinger/Scheduler/Scheduler.h
index ccb3aa7..ccaa05f 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.h
+++ b/services/surfaceflinger/Scheduler/Scheduler.h
@@ -346,7 +346,9 @@
     // Used to skip event dispatch before EventThread creation during boot.
     // TODO: b/241285191 - Reorder Scheduler initialization to avoid this.
     bool hasEventThreads() const {
-        return CC_LIKELY(mRenderEventThread && mLastCompositeEventThread);
+        return CC_LIKELY(
+                mRenderEventThread &&
+                (FlagManager::getInstance().deprecate_vsync_sf() || mLastCompositeEventThread));
     }
 
     EventThread& eventThreadFor(Cycle cycle) const {