commit 5e16196c597f50d390f9631e6ccca863afb66afc
author Huihong Luo <huisinro@google.com> Fri Aug 18 14:26:32 2023 -0700
committer Huihong Luo <huisinro@google.com> Mon Feb 12 08:57:57 2024 -0800
tree fb3df7059f238c4c7da70fb4baddffab1f3fa7cf
parent 347589f641ea3331ebc2b2266b188e51b2001496

Fix a crash for skipped layers with null buffers

No need to process these layers.

Bug: 240653315
Bug: 230073351
Test: YouTube PIP at home screen
Change-Id: Iced392706e33a2241197050ddd24e0fffaa3a723

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
index 0f70d84..091c207 100644
--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
@@ -664,6 +664,9 @@
 void OutputLayer::writeBufferStateToHWC(HWC2::Layer* hwcLayer,
                                         const LayerFECompositionState& outputIndependentState,
                                         bool skipLayer) {
+    if (skipLayer && outputIndependentState.buffer == nullptr) {
+        return;
+    }
     auto supportedPerFrameMetadata =
             getOutput().getDisplayColorProfile()->getSupportedPerFrameMetadata();
     if (auto error = hwcLayer->setPerFrameMetadata(supportedPerFrameMetadata,