Merge "Skip pixel format validation if IMPLEMENTATION_DEFINED" into main (c882d013) · Commits · e / os / platform_frameworks_native

libs/ui/Gralloc5.cpp

+10 −8

Original line number	Diff line number	Diff line
		@@ -518,16 +518,18 @@ status_t Gralloc5Mapper::validateBufferSize(buffer_handle_t bufferHandle, uint32
		}
		}
		{
		auto expected = static_cast<APixelFormat>(format);
		if (expected != APixelFormat::IMPLEMENTATION_DEFINED) {
		auto value =
		getStandardMetadata<StandardMetadataType::PIXEL_FORMAT_REQUESTED>(mMapper,
		bufferHandle);
		if (static_cast<::aidl::android::hardware::graphics::common::PixelFormat>(format) !=
		value) {
		if (expected != value) {
		ALOGW("Format didn't match, expected %d got %s", format,
		value.has_value() ? toString(*value).c_str() : "<null>");
		return BAD_VALUE;
		}
		}
		}
		{
		auto value = getStandardMetadata<StandardMetadataType::LAYER_COUNT>(mMapper, bufferHandle);
		if (layerCount != value) {