From 3cb3d4e3906eb43a01464e8862772295dab50f78 Mon Sep 17 00:00:00 2001 From: Dominik Laskowski Date: Thu, 21 Nov 2019 11:14:45 -0800 Subject: SF: Redesign API to query display information The DisplayInfo list returned by ISurfaceComposer for display configs contains display information/state redundant across configs. Extract config information to DisplayConfig, and repurpose DisplayInfo for immutable information about a physical display. In a future CL, SF will populate DisplayInfo with additional data (e.g. connection type, EDID fields) on initial connection. DisplayConfigs retain the ability to reload on subsequent connections. Introduce ui::DisplayState for transactional state applicable to both physical and virtual displays. Bug: 144601064 Test: dumpsys display Change-Id: I72003e8ef71483ef483d0de85d28b859a6c9f5fc --- services/surfaceflinger/DisplayDevice.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services/surfaceflinger/DisplayDevice.cpp') diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 4ae6dadfe8..4e0191d2ed 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -146,12 +146,12 @@ ui::Dataspace DisplayDevice::getCompositionDataSpace() const { return mCompositionDisplay->getState().dataspace; } -void DisplayDevice::setLayerStack(uint32_t stack) { +void DisplayDevice::setLayerStack(ui::LayerStack stack) { mCompositionDisplay->setLayerStackFilter(stack, isPrimary()); } -void DisplayDevice::setDisplaySize(const int newWidth, const int newHeight) { - mCompositionDisplay->setBounds(ui::Size(newWidth, newHeight)); +void DisplayDevice::setDisplaySize(int width, int height) { + mCompositionDisplay->setBounds(ui::Size(width, height)); } void DisplayDevice::setProjection(ui::Rotation orientation, Rect viewport, Rect frame) { @@ -286,7 +286,7 @@ bool DisplayDevice::needsFiltering() const { return mCompositionDisplay->getState().needsFiltering; } -uint32_t DisplayDevice::getLayerStack() const { +ui::LayerStack DisplayDevice::getLayerStack() const { return mCompositionDisplay->getState().layerStackId; } -- cgit v1.2.3-59-g8ed1b