commit db16a2be4054d0dd7d940f4fa0a2ced0575fd2e7
author Leon Scroggins III <scroggo@google.com> Mon Feb 06 17:50:05 2023 -0500
committer Leon Scroggins III <scroggo@google.com> Mon Feb 06 20:13:23 2023 -0500
tree 0a9f0cf2a81a8b268f20064fe87d5d74df20e8c1
parent 6c94ce4393a530159863324832aad5b482937a5a

Revert "Create a VsyncSchedule per display"

This reverts commit 31d41415101ff3483ce1cc5a9c2ef322490a05bd.

Conflicts:
    services/surfaceflinger/Scheduler/EventThread.cpp
    services/surfaceflinger/SurfaceFlinger.cpp

Bug: 267562341
Test: ARC Regression Dashboard
Change-Id: I0757a7df540fad316b2db42e4c77f1c73bc49420

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 8e74716..7dde6b4 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -30,7 +30,6 @@
 #include <compositionengine/Output.h>
 #include <compositionengine/OutputLayer.h>
 #include <compositionengine/impl/OutputLayerCompositionState.h>
-#include <ftl/concat.h>
 #include <log/log.h>
 #include <ui/DebugUtils.h>
 #include <ui/GraphicBuffer.h>
@@ -149,17 +148,16 @@
     return mUpdateDeviceProductInfoOnHotplugReconnect;
 }
 
-std::optional<PhysicalDisplayId> HWComposer::onVsync(hal::HWDisplayId hwcDisplayId,
-                                                     nsecs_t timestamp) {
-    const auto displayIdOpt = toPhysicalDisplayId(hwcDisplayId);
-    if (!displayIdOpt) {
+bool HWComposer::onVsync(hal::HWDisplayId hwcDisplayId, nsecs_t timestamp) {
+    const auto displayId = toPhysicalDisplayId(hwcDisplayId);
+    if (!displayId) {
         LOG_HWC_DISPLAY_ERROR(hwcDisplayId, "Invalid HWC display");
-        return {};
+        return false;
     }
 
-    RETURN_IF_INVALID_DISPLAY(*displayIdOpt, {});
+    RETURN_IF_INVALID_DISPLAY(*displayId, false);
 
-    auto& displayData = mDisplayData[*displayIdOpt];
+    auto& displayData = mDisplayData[*displayId];
 
     {
         // There have been reports of HWCs that signal several vsync events
@@ -168,18 +166,18 @@
         // out here so they don't cause havoc downstream.
         if (timestamp == displayData.lastPresentTimestamp) {
             ALOGW("Ignoring duplicate VSYNC event from HWC for display %s (t=%" PRId64 ")",
-                  to_string(*displayIdOpt).c_str(), timestamp);
-            return {};
+                  to_string(*displayId).c_str(), timestamp);
+            return false;
         }
 
         displayData.lastPresentTimestamp = timestamp;
     }
 
-    const ftl::Concat tag("HW_VSYNC_", displayIdOpt->value);
+    const auto tag = "HW_VSYNC_" + to_string(*displayId);
     ATRACE_INT(tag.c_str(), displayData.vsyncTraceToggle);
     displayData.vsyncTraceToggle = !displayData.vsyncTraceToggle;
 
-    return displayIdOpt;
+    return true;
 }
 
 size_t HWComposer::getMaxVirtualDisplayCount() const {