diff options
| author | 2021-02-22 22:30:28 +0000 | |
|---|---|---|
| committer | 2021-02-22 22:30:28 +0000 | |
| commit | a8109d468ad5beb766e385ae213398ad0c97c23b (patch) | |
| tree | 26d21add15aa00f2cc4ec081f1c23472625661d2 /libs/gui/LayerState.cpp | |
| parent | ec1691271f4732807a21fd678bfddb3c7b25c3ae (diff) | |
| parent | c00c669cbc76f201879ebf2e0ce60d386a0fa483 (diff) | |
Merge "StretchEffect changes" into sc-dev
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 f053372cb0..288bf92c15 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -548,6 +548,10 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eAutoRefreshChanged; autoRefresh = other.autoRefresh; } + if (other.what & eStretchChanged) { + what |= eStretchChanged; + stretchEffect = other.stretchEffect; + } if ((other.what & what) != other.what) { ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? " "other.what=0x%" PRIu64 " what=0x%" PRIu64, |