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

Commit 580803cf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add missing flag to transaction merge"

parents 266aec23 0e816879

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);

    }

}