Merge "Add snapshot nullptr check in SF#renderScreenImpl" into main (54602b48) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -8295,11 +8295,13 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl(
		const frontend::LayerSnapshot* snapshot = mLayerLifecycleManagerEnabled
		? mLayerSnapshotBuilder.getSnapshot(parent->sequence)
		: parent->getLayerSnapshot();
		display = findDisplay([layerStack =
		snapshot->outputFilter.layerStack](const auto& display) {
		if (snapshot) {
		display = findDisplay([layerStack = snapshot->outputFilter.layerStack](
		const auto& display) {
		return display.getLayerStack() == layerStack;
		}).get();
		}
		}

		if (display == nullptr) {
		display = renderArea->getDisplayDevice().get();