From 0e8168799b93bdce8bc67c97885e7d2dac32a1b4 Mon Sep 17 00:00:00 2001 From: Vishnu Nair Date: Wed, 14 Jul 2021 10:53:04 -0700 Subject: Add missing flag to transaction merge Test: presubmit Change-Id: Idd2195d627f3aece845a704c16ca5f8c7f339da3 --- libs/gui/LayerState.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libs/gui/LayerState.cpp') diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 17d614eab2..d73470dd0b 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -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); } } -- cgit v1.2.3-59-g8ed1b