Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c36cd89 authored by chaviw's avatar chaviw
Browse files

Merge color property in a transaction 

The LayerState.merge code didn't have colors getting merged

Test: Builds
Fixes: 206341593
Change-Id: Ic2721242c772099802f635f8019cb3b7a24d6c90
parent 4b26b7fb

libs/gui/LayerState.cpp

+4 −0
Original line number Diff line number Diff line
@@ -573,6 +573,10 @@ void layer_state_t::merge(const layer_state_t& other) { 
        what |= eDropInputModeChanged;

        dropInputMode = other.dropInputMode;

    }

    if (other.what & eColorChanged) {

        what |= eColorChanged;

        color = other.color;

    }

    if ((other.what & what) != other.what) {

        ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "

              "other.what=0x%" PRIu64 " what=0x%" PRIu64,