diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-01-10 18:54:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-10 18:54:39 +0000 |
| commit | ee4a87b8617b91e5c3006efa74b4a25377b2a07f (patch) | |
| tree | 83978985fd21f680fc4237b76bb2f0ec3d20e86d | |
| parent | 6f28d23f07e70a91157880b5c9d9423c388de92d (diff) | |
| parent | 677a3ec523558ed9d41422f51a92a7cc485e2411 (diff) | |
| download | native-ee4a87b8617b91e5c3006efa74b4a25377b2a07f.tar.gz | |
Merge "DO NOT MERGE SF: Fix releaseBufferEndpoint merge issue" into sc-v2-dev
| -rw-r--r-- | libs/gui/LayerState.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index d266229a8e..77a883b332 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -509,6 +509,7 @@ void layer_state_t::merge(const layer_state_t& other) { if (other.what & eCachedBufferChanged) { what |= eCachedBufferChanged; cachedBuffer = other.cachedBuffer; + releaseBufferEndpoint = other.releaseBufferEndpoint; } if (other.what & eBackgroundColorChanged) { what |= eBackgroundColorChanged; |