commit c638470eccb89b0ec9594f968d9ccc07c5a6854b
author Vishnu Nair <vishnun@google.com> Mon Jul 31 12:22:20 2023 -0700
committer Vishnu Nair <vishnun@google.com> Mon Jul 31 19:56:06 2023 +0000
tree 3ad48f298578d2c85fb92171e9e1d5e52397c962
parent 774bcbe5c307aeb0e61203294948709fad2b4b45

[sf] respect parent alpha when calculating blur radius and blur regions

Fixes a regression caused by breaking front end and composition engine dependencies.

Test: atest BlurTests
Bug: 293532283

Change-Id: If9962a46bc7dba3b8f4256ae23307094a9c93290

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 3a41f15..1a0517a 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -594,8 +594,8 @@
     snapshot->localTransformInverse = snapshot->localTransform.inverse();
     snapshot->blendMode = static_cast<Hwc2::IComposerClient::BlendMode>(blendMode);
     snapshot->alpha = alpha;
-    snapshot->backgroundBlurRadius = drawingState.backgroundBlurRadius;
-    snapshot->blurRegions = drawingState.blurRegions;
+    snapshot->backgroundBlurRadius = getBackgroundBlurRadius();
+    snapshot->blurRegions = getBlurRegions();
     snapshot->stretchEffect = getStretchEffect();
 }
 
@@ -664,8 +664,8 @@
         snapshot->forceClientComposition = true;
     }
     // If there are no visible region changes, we still need to update blur parameters.
-    snapshot->blurRegions = drawingState.blurRegions;
-    snapshot->backgroundBlurRadius = drawingState.backgroundBlurRadius;
+    snapshot->blurRegions = getBlurRegions();
+    snapshot->backgroundBlurRadius = getBackgroundBlurRadius();
 
     // Layer framerate is used in caching decisions.
     // Retrieve it from the scheduler which maintains an instance of LayerHistory, and store it in