diff options
| author | chaviw <chaviw@google.com> | 2021-11-18 10:37:33 -0600 |
|---|---|---|
| committer | chaviw <chaviw@google.com> | 2021-11-18 10:37:33 -0600 |
| commit | 4c36cd8922ca0e8c451d0b8310791433ba971844 (patch) | |
| tree | f4e35c1278dfd916c737ef26262d181acdfeff0f | |
| parent | 4b26b7fb4604ded2ec4e2bb3e4f40a76c48c6fcf (diff) | |
| download | native-4c36cd8922ca0e8c451d0b8310791433ba971844.tar.gz | |
Merge color property in a transaction
The LayerState.merge code didn't have colors getting merged
Test: Builds
Fixes: 206341593
Change-Id: Ic2721242c772099802f635f8019cb3b7a24d6c90
| -rw-r--r-- | libs/gui/LayerState.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 54735fa133..d266229a8e 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -573,6 +573,10 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eDropInputModeChanged; dropInputMode = other.dropInputMode; } + if (other.what & eColorChanged) { + what |= eColorChanged; + color = other.color; + } if ((other.what & what) != other.what) { ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? " "other.what=0x%" PRIu64 " what=0x%" PRIu64, |