commit 25aae731212fd2ae3dfaf82936d655ec3f3d17b4
author Huihong Luo <huisinro@google.com> Mon Sep 26 11:45:43 2022 -0700
committer Huihong Luo <huisinro@google.com> Mon Sep 26 18:48:16 2022 +0000
tree f7e60d7b28f553ce4a09d0b5fd8a1572061ebc51
parent 82839ebcfc80ff5938e58bdbf7d863af8af11fd0

Remove internal display related methods

Sync with changes made in SurfaceFlinger and SurfaceComposerClient.
Use the first display from the display list returned from SurfaceComposerClient.

Bug: 241285477
Test: run libhwui test
Change-Id: I0c76d66338bb3f6d69dc3d829d438ffd2a4462a6

libs/hwui/tests/common/TestContext.cpp

diff --git a/libs/hwui/tests/common/TestContext.cpp b/libs/hwui/tests/common/TestContext.cpp
index 898c64b..0faa8f4 100644
--- a/libs/hwui/tests/common/TestContext.cpp
+++ b/libs/hwui/tests/common/TestContext.cpp
@@ -28,7 +28,10 @@
 #if HWUI_NULL_GPU
         info.density = 2.f;
 #else
-        const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken();
+        const std::vector<PhysicalDisplayId> ids = SurfaceComposerClient::getPhysicalDisplayIds();
+        LOG_ALWAYS_FATAL_IF(ids.empty(), "%s: No displays", __FUNCTION__);
+
+        const sp<IBinder> token = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());
         LOG_ALWAYS_FATAL_IF(!token, "%s: No internal display", __FUNCTION__);
 
         const status_t status = SurfaceComposerClient::getStaticDisplayInfo(token, &info);
@@ -48,7 +51,10 @@
         config.xDpi = config.yDpi = 320.f;
         config.refreshRate = 60.f;
 #else
-        const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken();
+        const std::vector<PhysicalDisplayId> ids = SurfaceComposerClient::getPhysicalDisplayIds();
+        LOG_ALWAYS_FATAL_IF(ids.empty(), "%s: No displays", __FUNCTION__);
+
+        const sp<IBinder> token = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());
         LOG_ALWAYS_FATAL_IF(!token, "%s: No internal display", __FUNCTION__);
 
         const status_t status = SurfaceComposerClient::getActiveDisplayMode(token, &config);