commit dda78be4e1b39ecb3e7fd0344101cdce7a8a9e1a
author Lucas Dupin <dupin@google.com> Mon Jun 01 22:05:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 01 22:05:20 2020 +0000
tree 47c8e12395a985d73e160e149327f910908b0b2f
parent d9aeae45274d3b4fb1a8ac88a39a7641982ac0dc
parent f842919d1ed17fa9dd27fef86af30e70432a54cd

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

Original change: undetermined

Change-Id: I9b246338e58bd29301b7923f9fe348c6c038e28d

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