commit 1041b72bd8153448536d9e80946dd398aa8b57c2
author Chris Li <lihongyu@google.com> Mon Jun 20 12:56:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 20 12:56:02 2022 +0000
tree 84937b78ad69fc72bc7adb1c668c3746d4f14ad9
parent d729574a2d5a2d41bc9e0f3381ebdcebe6f9d95c
parent 8fce12b797d6cc676c2e543b1d2a74eafb54b8b2

Merge "Fix the shadow problem caused by layer parent switching" am: 8ab01b202f am: 6d3c8a29d4 am: 8fce12b797

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2075863

Change-Id: I053dfa500d9d67c1f5acfbde4b0bf8ad104fd5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index be16942..38662bd 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1586,8 +1586,10 @@
 void Layer::setChildrenDrawingParent(const sp<Layer>& newParent) {
     for (const sp<Layer>& child : mDrawingChildren) {
         child->mDrawingParent = newParent;
+        const float parentShadowRadius =
+                newParent->canDrawShadows() ? 0.f : newParent->mEffectiveShadowRadius;
         child->computeBounds(newParent->mBounds, newParent->mEffectiveTransform,
-                             newParent->mEffectiveShadowRadius);
+                             parentShadowRadius);
     }
 }