diff options
| author | 2018-02-06 16:46:39 -0800 | |
|---|---|---|
| committer | 2018-02-13 16:30:10 -0800 | |
| commit | ca27f2500cff74ae1e08b3ae06f18e9b3414ffb7 (patch) | |
| tree | e98990b6977ea6fa7ae3b5e5683da4922c492901 /libs/gui/LayerState.cpp | |
| parent | e9e63913379f9cea3e090ebf398514f437e5d525 (diff) | |
Allow destroySurface to get called in transaction.
Previously, destroy was always initiated immediatley and could not be
synchronized with a client transaction. This change allows
destroySurface to be called in the same transaction as other client
state updates.
Test: Unit tests pass
Test: Call from Java fixes bugs.
Change-Id: I841359530538961a0187216cc455cc388c0ede77
Fixes: 72953020
Fixes: 71499373
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index b5295f2801..01acc2de20 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -231,6 +231,9 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eReparent; parentHandleForChild = other.parentHandleForChild; } + if (other.what & eDestroySurface) { + what |= eDestroySurface; + } } }; // namespace android |