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

Commit b55060ce authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Merge ColorSpaceAgnosticChanged property in a transactioin" into tm-dev am: f4b49765 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17183385

Change-Id: If7c65b63b99657c46e487286b45481afca7a9b50
parents 186676ae f4b49765

libs/gui/LayerState.cpp

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

        color = other.color;

    }

    if (other.what & eColorSpaceAgnosticChanged) {

        what |= eColorSpaceAgnosticChanged;

        colorSpaceAgnostic = other.colorSpaceAgnostic;

    }

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

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

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