aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Mouri <alecmouri@google.com>2022-06-10 16:46:57 +0000
committerAlec Mouri <alecmouri@google.com>2022-06-13 22:21:01 +0000
commit882834606047826ced257445adaeb59ecb153da0 (patch)
tree84b590ac5dc333166043b1b05e41d8ce0da2e089
parent529195438999bfc59f7c311ef0483701eb601039 (diff)
downloadcuttlefish-882834606047826ced257445adaeb59ecb153da0.tar.gz
Use EffectLayer-backed color fade
Presubmit tests are breaking because of a difficult-to-resolve deadlock involving SurfaceFlinger, virtual displays, and the ColorFade-animation. To resolve this, enable the ColorFade variant that is backed by an EffectLayer, which does not involve buffer production and so sidesteps the deadlock. Bug: 233386717 Test: android.server.wm.MultiDisplayKeyguardTests Change-Id: I6c71a24e144ccf01fb0d74129ea048e927dc9bf7
-rw-r--r--shared/phone/overlays/core/res/values/config.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/shared/phone/overlays/core/res/values/config.xml b/shared/phone/overlays/core/res/values/config.xml
index 8d512cc62..1d7b0196a 100644
--- a/shared/phone/overlays/core/res/values/config.xml
+++ b/shared/phone/overlays/core/res/values/config.xml
@@ -67,4 +67,6 @@
<!-- Enable Night display, which requires HWC 2.0. -->
<bool name="config_nightDisplayAvailable">true</bool>
+ <!-- Let ColorFade use a color layer to avoid deadlocking in WM CTS. See b/233386717. -->
+ <bool name="config_animateScreenLights">true</bool>
</resources>