summaryrefslogtreecommitdiff
path: root/libs/hwui/tests/common/TestContext.cpp
diff options
context:
space:
mode:
authorMarin Shalamanov <shalamanov@google.com>2021-02-22 18:28:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-02-22 18:28:27 +0000
commit1b520a6d3f38d2bc6c288fde8fb76e65efd98cbc (patch)
tree49994dc599d1837c01c91baf80778896380809cc /libs/hwui/tests/common/TestContext.cpp
parent1c74818f30450346135777fd9f54de865655a9b9 (diff)
parent463ad8ee22fecc4e0f53757c618c5e77239f6467 (diff)
Merge "Introduce DynamicDisplayInfo" into sc-dev
Diffstat (limited to 'libs/hwui/tests/common/TestContext.cpp')
-rw-r--r--libs/hwui/tests/common/TestContext.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/tests/common/TestContext.cpp b/libs/hwui/tests/common/TestContext.cpp
index 6a9a98d6743b..898c64bd4159 100644
--- a/libs/hwui/tests/common/TestContext.cpp
+++ b/libs/hwui/tests/common/TestContext.cpp
@@ -22,16 +22,16 @@ namespace android {
namespace uirenderer {
namespace test {
-const DisplayInfo& getDisplayInfo() {
- static DisplayInfo info = [] {
- DisplayInfo info;
+const ui::StaticDisplayInfo& getDisplayInfo() {
+ static ui::StaticDisplayInfo info = [] {
+ ui::StaticDisplayInfo info;
#if HWUI_NULL_GPU
info.density = 2.f;
#else
const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken();
LOG_ALWAYS_FATAL_IF(!token, "%s: No internal display", __FUNCTION__);
- const status_t status = SurfaceComposerClient::getDisplayInfo(token, &info);
+ const status_t status = SurfaceComposerClient::getStaticDisplayInfo(token, &info);
LOG_ALWAYS_FATAL_IF(status, "%s: Failed to get display info", __FUNCTION__);
#endif
return info;