diff options
| author | Dominik Laskowski <domlaskowski@google.com> | 2019-01-25 02:35:50 -0800 |
|---|---|---|
| committer | Dominik Laskowski <domlaskowski@google.com> | 2019-02-02 10:14:22 -0800 |
| commit | dcb38bbd32eb96ec46d69658390353a853b3af6d (patch) | |
| tree | 78b3424dde3c1eac9969482afaff98462dc48221 /libs/gui/tests/EndToEndNativeInputTest.cpp | |
| parent | 8a0222e629b82dda35840aa74eeec55bcc16999d (diff) | |
SF: Plumb physical display IDs to libgui
This CL replaces ISurfaceComposer::{eDisplayIdMain,eDisplayIdHdmi} with
the stable 64-bit display IDs generated by SF. Note that the 64-bit IDs
fall back to the old values if the HWC API for display identification is
not supported.
Bug: 74619554
Test: LocalDisplayAdapter and Choreographer receive 64-bit IDs
Test: 64-bit IDs fall back to 0 and 1 on HWC 2.2 and below
Change-Id: I3c08eff6eb8bb179ecce596ab2820a2aa44c8649
Diffstat (limited to 'libs/gui/tests/EndToEndNativeInputTest.cpp')
| -rw-r--r-- | libs/gui/tests/EndToEndNativeInputTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/gui/tests/EndToEndNativeInputTest.cpp b/libs/gui/tests/EndToEndNativeInputTest.cpp index ac97733508..4a7848020f 100644 --- a/libs/gui/tests/EndToEndNativeInputTest.cpp +++ b/libs/gui/tests/EndToEndNativeInputTest.cpp @@ -233,9 +233,11 @@ public: mComposerClient = new SurfaceComposerClient; ASSERT_EQ(NO_ERROR, mComposerClient->initCheck()); + const auto display = mComposerClient->getInternalDisplayToken(); + ASSERT_FALSE(display == nullptr); + DisplayInfo info; - auto display = mComposerClient->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain); - SurfaceComposerClient::getDisplayInfo(display, &info); + ASSERT_EQ(NO_ERROR, mComposerClient->getDisplayInfo(display, &info)); // After a new buffer is queued, SurfaceFlinger is notified and will // latch the new buffer on next vsync. Let's heuristically wait for 3 |