diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-03-23 20:33:04 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-03-24 02:40:01 +0000 |
| commit | 757dbb836469bbdd7eb8312deaf584fe0c99c17d (patch) | |
| tree | a678b33ad5f0f024d0f942f127b91665f0616193 /libs/hwui/tests/common/TestContext.cpp | |
| parent | 7710a95746be8dba8c6ffe7172f9c01334a2ca81 (diff) | |
| parent | f022dd1e6827ebf7c52b06aa40f2059a3f0f5cad (diff) | |
Merge SP1A.210311.001
Change-Id: Id1a205bf3f0609c0b13e4bea377056c3b06299fa
Diffstat (limited to 'libs/hwui/tests/common/TestContext.cpp')
| -rw-r--r-- | libs/hwui/tests/common/TestContext.cpp | 8 |
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; |