commit b21365d883a98ed295c3d6934e7ae5c460b39f89
author Lucas Dupin <dupin@google.com> Mon Jun 01 22:05:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 01 22:05:28 2020 +0000
tree bd8d5d52ca6069c39bc6095b2062861dfc42cae9
parent 5c1f478f3d0080679ebb0b44e8e32086042a3d07
parent f842919d1ed17fa9dd27fef86af30e70432a54cd

Merge "Do not accept blur transaction when disabled" into rvc-dev am: b31d3c81e9 am: f842919d1e

Original change: undetermined

Change-Id: Ia97126c2d9c6cfd83cec350db1e7951b016fc172

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) {