commit 2a0066dad5412c5135338988b2b88061818b7962
author Ady Abraham <adyabr@google.com> Thu Jul 15 20:16:58 2021 -0700
committer Ady Abraham <adyabr@google.com> Fri Sep 10 22:44:01 2021 +0000
tree 448d9cc386dca492f1835045d0cf4c9910028ef4
parent c2d756df917b476bba8aa59bb21a3dc77f97268b

SF: return the active display from getInternalDisplayId

So clients that uses SurfaceComposerClient::getInternalDisplayId
such as screenrecord would get the current active display

Test: screenrecord
Bug: 193821864
Bug: 199336728
Change-Id: Ief856c736c78ab9ddca3c4ffccd8e374c050b0bd

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index d70e2e9..34b5cdc 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -619,12 +619,18 @@
 std::vector<PhysicalDisplayId> SurfaceFlinger::getPhysicalDisplayIdsLocked() const {
     std::vector<PhysicalDisplayId> displayIds;
     displayIds.reserve(mPhysicalDisplayTokens.size());
+    const auto defaultDisplayId = [this]() REQUIRES(mStateLock) {
+        if (const auto display = getDefaultDisplayDeviceLocked()) {
+            return display->getPhysicalId();
+        }
 
-    const auto internalDisplayId = getInternalDisplayIdLocked();
-    displayIds.push_back(internalDisplayId);
+        // fallback to the internal display id if the active display is unknown
+        return getInternalDisplayIdLocked();
+    }();
+    displayIds.push_back(defaultDisplayId);
 
     for (const auto& [id, token] : mPhysicalDisplayTokens) {
-        if (id != internalDisplayId) {
+        if (id != defaultDisplayId) {
             displayIds.push_back(id);
         }
     }