summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-12 00:07:45 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-12 00:07:45 +0000
commit1684c9585b24aeb0f6f69ad345bacecee1363c7f (patch)
tree83978985fd21f680fc4237b76bb2f0ec3d20e86d
parentdf43ab17d693d682c0e2dbc8e64ea4f6d9e11090 (diff)
parentee4a87b8617b91e5c3006efa74b4a25377b2a07f (diff)
downloadnative-1684c9585b24aeb0f6f69ad345bacecee1363c7f.tar.gz
Snap for 8068644 from ee4a87b8617b91e5c3006efa74b4a25377b2a07f to sc-d2-release
Change-Id: Iebab58a1aafc304717bf20237479379b768d8f1c
-rw-r--r--libs/gui/LayerState.cpp1
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;