commit b31d3c81e9061961c23c24b8f29a81d772b13d93
author Lucas Dupin <dupin@google.com> Mon Jun 01 21:14:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 01 21:14:14 2020 +0000
tree 47c8e12395a985d73e160e149327f910908b0b2f
parent 5234f933a40952079830649b565ece6ae47eea93
parent 130e55ca9365b079454e99f868df1f4d0684f8e5

Merge "Do not accept blur transaction when disabled" into rvc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2d25319..c3214f0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3685,7 +3685,7 @@
         if (layer->setCornerRadius(s.cornerRadius))
             flags |= eTraversalNeeded;
     }
-    if (what & layer_state_t::eBackgroundBlurRadiusChanged && !mDisableBlurs) {
+    if (what & layer_state_t::eBackgroundBlurRadiusChanged && !mDisableBlurs && mSupportsBlur) {
         if (layer->setBackgroundBlurRadius(s.backgroundBlurRadius)) flags |= eTraversalNeeded;
     }
     if (what & layer_state_t::eLayerStackChanged) {