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

Commit 73487347 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Merge color property in a transaction" into sc-v2-dev am: 11595687 

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

Change-Id: Iec6a7109b5adf68def94d88e6adfc03b41db6868
parents f7822a9a 11595687

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,