commit e1166476abffea6d4a39fb72636aa5736acb9398
author Ady Abraham <adyabr@google.com> Thu Jul 15 10:56:06 2021 -0700
committer Ady Abraham <adyabr@google.com> Thu Jul 15 10:57:02 2021 -0700
tree 93cb06a32163e162f3b2f56efb4f0d40a94b14c2
parent 559098d2177a14fa61914bc046abefd0184b2afb

SF: process ComposerHalVsync for the active display

Bug: 188811178
Test: Run app on the active display and collect systraces
Change-Id: Ied67a1d63f52c60c7265286728ec2730a101747c

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cb3f242..2c2bdad 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1707,10 +1707,10 @@
     ATRACE_CALL();
 
     Mutex::Autolock lock(mStateLock);
-
-    if (const auto displayId = getHwComposer().toPhysicalDisplayId(hwcDisplayId)) {
-        auto token = getPhysicalDisplayTokenLocked(*displayId);
-        auto display = getDisplayDeviceLocked(token);
+    const auto displayId = getHwComposer().toPhysicalDisplayId(hwcDisplayId);
+    if (displayId) {
+        const auto token = getPhysicalDisplayTokenLocked(*displayId);
+        const auto display = getDisplayDeviceLocked(token);
         display->onVsync(timestamp);
     }
 
@@ -1718,8 +1718,10 @@
         return;
     }
 
-    if (hwcDisplayId != getHwComposer().getInternalHwcDisplayId()) {
-        // For now, we don't do anything with external display vsyncs.
+    const bool isActiveDisplay =
+            displayId && getPhysicalDisplayTokenLocked(*displayId) == mActiveDisplayToken;
+    if (!isActiveDisplay) {
+        // For now, we don't do anything with non active display vsyncs.
         return;
     }