diff options
| author | 2021-11-18 21:52:38 +0000 | |
|---|---|---|
| committer | 2021-11-18 21:52:38 +0000 | |
| commit | 73487347ed2f3b41cc44d8acef68e297e28bfcbc (patch) | |
| tree | b6a2305e53c59166809a47755dd56888aa7621e4 /libs/gui/LayerState.cpp | |
| parent | f7822a9abb99f334f3fcf6c57cf576c430618833 (diff) | |
| parent | 11595687cb64ef66b390deaf9aca9f891423afd5 (diff) | |
Merge "Merge color property in a transaction" into sc-v2-dev am: 11595687cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16295838
Change-Id: Iec6a7109b5adf68def94d88e6adfc03b41db6868
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 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, |