Merge cherrypicks of ['googleplex-android-review.googlesource.com/35830399'] into 25Q4-release. Change-Id: I13158564e4fcefadd00e6eae45a24df901eaaa25
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index a031782..9fe0528 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -782,8 +782,10 @@ // one, or create a new one if we do not. auto outputLayer = ensureOutputLayer(prevOutputLayerIndex, layerFE); - coverage.aboveBlurRequests += static_cast<int32_t>(layerFEState->backgroundBlurRadius > 0 || - !layerFEState->blurRegions.empty()); + coverage.aboveBlurRequests += static_cast<int32_t>(layerFEState->backgroundBlurRadius > 0); + // Each blur region can contain a separate blur radius so we need to count each region + // as a separate request. + coverage.aboveBlurRequests += static_cast<int32_t>(layerFEState->blurRegions.size()); // Store the layer coverage information into the layer state as some of it // is useful later.