diff options
| author | 2022-01-10 19:12:45 +0000 | |
|---|---|---|
| committer | 2022-01-10 19:12:45 +0000 | |
| commit | dc15f6fefdf4a10e53fab4b7cdeec05621aa63c1 (patch) | |
| tree | 647eac8e336b39344bbac566d062db3824f07817 /libs/gui/LayerState.cpp | |
| parent | 741b99e6b9cbf7b8f65fe25fedfb378bd670dd72 (diff) | |
| parent | 677a3ec523558ed9d41422f51a92a7cc485e2411 (diff) | |
DO NOT MERGE SF: Fix releaseBufferEndpoint merge issue am: 677a3ec523
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16585805
Change-Id: If675732ee6d664dd3fb9f2b51e3ae2d884a01c9c
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -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; |