commit c2159564309e92b2ddaddcebce0c52591314bc4c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 16 03:25:14 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 16 03:25:14 2021 +0000
tree e355b018fad53ef8ee51426610fbfcde73107382
parent 329ed55a388e1ad023d7ddda99781cac32eb3f04
parent e1166476abffea6d4a39fb72636aa5736acb9398

Merge "SF: process ComposerHalVsync for the active display" into sc-v2-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2d974d1..5e17828 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1713,10 +1713,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);
     }
 
@@ -1724,8 +1724,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;
     }