From dcb38bbd32eb96ec46d69658390353a853b3af6d Mon Sep 17 00:00:00 2001 From: Dominik Laskowski Date: Fri, 25 Jan 2019 02:35:50 -0800 Subject: 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 --- cmds/flatland/GLHelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmds/flatland/GLHelper.cpp') 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 dpy = mSurfaceComposerClient->getBuiltInDisplay(0); + const sp dpy = mSurfaceComposerClient->getInternalDisplayToken(); if (dpy == nullptr) { - fprintf(stderr, "SurfaceComposer::getBuiltInDisplay failed.\n"); + fprintf(stderr, "SurfaceComposer::getInternalDisplayToken failed.\n"); return false; } -- cgit v1.2.3-59-g8ed1b