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

Commit 0e816879 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Add missing flag to transaction merge 

Test: presubmit
Change-Id: Idd2195d627f3aece845a704c16ca5f8c7f339da3
parent 27039bdf

libs/gui/LayerState.cpp

+5 −2
Original line number Diff line number Diff line
@@ -553,10 +553,13 @@ void layer_state_t::merge(const layer_state_t& other) { 
        what |= eDestinationFrameChanged;

        destinationFrame = other.destinationFrame;

    }

    if (other.what & eProducerDisconnect) {

        what |= eProducerDisconnect;

    }

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

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

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

              other.what, what);

              "other.what=0x%" PRIX64 " what=0x%" PRIX64 " unmerged flags=0x%" PRIX64,

              other.what, what, (other.what & what) ^ other.what);

    }

}