diff options
| author | 2019-01-25 02:35:50 -0800 | |
|---|---|---|
| committer | 2019-02-02 10:14:22 -0800 | |
| commit | dcb38bbd32eb96ec46d69658390353a853b3af6d (patch) | |
| tree | 78b3424dde3c1eac9969482afaff98462dc48221 /cmds/flatland/GLHelper.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 'cmds/flatland/GLHelper.cpp')
| -rw-r--r-- | cmds/flatland/GLHelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/flatland/GLHelper.cpp b/cmds/flatland/GLHelper.cpp index 62d2fa1548..d398559ee8 100644 --- a/cmds/flatland/GLHelper.cpp +++ b/cmds/flatland/GLHelper.cpp @@ -222,9 +222,9 @@ bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h, } bool GLHelper::computeWindowScale(uint32_t w, uint32_t h, float* scale) { - sp<IBinder> dpy = mSurfaceComposerClient->getBuiltInDisplay(0); + const sp<IBinder> dpy = mSurfaceComposerClient->getInternalDisplayToken(); if (dpy == nullptr) { - fprintf(stderr, "SurfaceComposer::getBuiltInDisplay failed.\n"); + fprintf(stderr, "SurfaceComposer::getInternalDisplayToken failed.\n"); return false; } |