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

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

Merge "SF: Fix incorrect LayerState logs"

parents 06b01aba 217d8e69

libs/gui/LayerState.cpp

+6 −2
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#define LOG_TAG "LayerState"



#include <utils/Errors.h>

#include <binder/Parcel.h>

#include <gui/ISurfaceComposerClient.h>
@@ -313,8 +315,10 @@ void layer_state_t::merge(const layer_state_t& other) { 
        sidebandStream = other.sidebandStream;

    }



    if (other.what != what) {

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

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

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

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

              other.what, what);

    }

}