SF: Fix incorrect LayerState logs
Bug: 115559277
Test: logcat
Change-Id: If924c60298a0d8fc433d45cdb71d229b57227385
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index deb8ea8..5a8d8db 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -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 @@
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);
}
}