commit 5d8dc5cc19860b458afaeac793e2c1e9abd3a7e5
author Ady Abraham <adyabr@google.com> Tue Sep 14 21:07:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 14 21:07:42 2021 +0000
tree 8bcad457365d673fe034ba14c9753c3c68605f19
parent 0fbf2976fc81020613d18347f8f5cc4b0038ec5b
parent 403a0be8053410ef797b7e4f3e404501bb1d36b6

Merge "SF: return the active display from getInternalDisplayId" into sc-v2-dev am: 403a0be805

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15305460

Change-Id: Ia7ce63c8a75f23b9ad8da2ba0b4ce86151640e55

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 594fde3..bfe619c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -619,17 +619,17 @@
 }
 
 std::vector<PhysicalDisplayId> SurfaceFlinger::getPhysicalDisplayIdsLocked() const {
-    const auto internalDisplayId = getInternalDisplayIdLocked();
-    if (!internalDisplayId) {
+    const auto display = getDefaultDisplayDeviceLocked();
+    if (!display) {
         return {};
     }
 
     std::vector<PhysicalDisplayId> displayIds;
     displayIds.reserve(mPhysicalDisplayTokens.size());
-    displayIds.push_back(*internalDisplayId);
+    displayIds.push_back(display->getPhysicalId());
 
     for (const auto& [id, token] : mPhysicalDisplayTokens) {
-        if (id != *internalDisplayId) {
+        if (id != display->getPhysicalId()) {
             displayIds.push_back(id);
         }
     }