diff options
| author | 2021-11-18 22:10:54 +0000 | |
|---|---|---|
| committer | 2021-11-18 22:10:54 +0000 | |
| commit | d8a9fc0455efccfe99b6b940e288c039cdceca82 (patch) | |
| tree | 694b35ea934bb1eaae3c9eb4427c0b4410440dcc /libs/gui/LayerState.cpp | |
| parent | 829b6a37b834b6554f900215b7030766c3a925df (diff) | |
| parent | 73487347ed2f3b41cc44d8acef68e297e28bfcbc (diff) | |
Merge "Merge color property in a transaction" into sc-v2-dev am: 11595687cb am: 73487347ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16295838
Change-Id: I486c6acff37079ff284c132f3234e95f12b2b315
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -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 f848e4ffde..cd1c810a29 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -502,6 +502,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%" PRIX64 " what=0x%" PRIX64 " unmerged flags=0x%" PRIX64, |