Merge "SF: Fix hdr info listeners" (80a71b06) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+2 −12

Original line number	Diff line number	Diff line
		@@ -1833,17 +1833,6 @@ status_t SurfaceFlinger::getDisplayBrightnessSupport(const sp<IBinder>& displayT
		return NO_ERROR;
		}

		bool SurfaceFlinger::hasVisibleHdrLayer(const sp<DisplayDevice>& display) {
		bool hasHdrLayers = false;
		mDrawingState.traverse([&,
		compositionDisplay = display->getCompositionDisplay()](Layer* layer) {
		hasHdrLayers \|= (layer->isVisible() &&
		compositionDisplay->includesLayer(layer->getCompositionEngineLayerFE()) &&
		isHdrDataspace(layer->getDataSpace()));
		});
		return hasHdrLayers;
		}

		status_t SurfaceFlinger::setDisplayBrightness(const sp<IBinder>& displayToken,
		const gui::DisplayBrightness& brightness) {
		if (!displayToken) {
		@@ -2638,7 +2627,8 @@ void SurfaceFlinger::postComposition() {
		int32_t maxArea = 0;
		mDrawingState.traverse([&, compositionDisplay = compositionDisplay](Layer* layer) {
		const auto layerFe = layer->getCompositionEngineLayerFE();
		if (layer->isVisible() && compositionDisplay->includesLayer(layerFe)) {
		if (layer->isVisible() &&
		compositionDisplay->includesLayer(layer->getOutputFilter())) {
		if (isHdrLayer(layer)) {
		const auto* outputLayer =
		compositionDisplay->getOutputLayerForLayer(layerFe);

+0 −3

Original line number	Diff line number	Diff line
		@@ -673,9 +673,6 @@ private:
		void setPowerModeInternal(const sp<DisplayDevice>& display, hal::PowerMode mode)
		REQUIRES(mStateLock, kMainThreadContext);

		// Returns true if the display has a visible HDR layer in its layer stack.
		bool hasVisibleHdrLayer(const sp<DisplayDevice>& display) REQUIRES(mStateLock);

		// Returns the preferred mode for PhysicalDisplayId if the Scheduler has selected one for that
		// display. Falls back to the display's defaultModeId otherwise.
		ftl::Optional<scheduler::FrameRateMode> getPreferredDisplayMode(