Combining background color related transactions/functions
Bug:122326454
Test: build, boot, SurfaceFlinger_test, ASurfaceControlTest cts test
Change-Id: I7ec9f2214c7422ab90ab56dd84daafd5b0bf720a
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2cf2cd8..fd696c1 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3854,17 +3854,16 @@
if (layer->setColor(s.color))
flags |= eTraversalNeeded;
}
- if (what & layer_state_t::eColorAlphaChanged) {
- if (layer->setColorAlpha(s.colorAlpha)) flags |= eTraversalNeeded;
- }
- if (what & layer_state_t::eColorDataspaceChanged) {
- if (layer->setColorDataspace(s.colorDataspace)) flags |= eTraversalNeeded;
- }
if (what & layer_state_t::eColorTransformChanged) {
if (layer->setColorTransform(s.colorTransform)) {
flags |= eTraversalNeeded;
}
}
+ if (what & layer_state_t::eBackgroundColorChanged) {
+ if (layer->setBackgroundColor(s.color, s.bgColorAlpha, s.bgColorDataspace)) {
+ flags |= eTraversalNeeded;
+ }
+ }
if (what & layer_state_t::eMatrixChanged) {
// TODO: b/109894387
//