From 8dd7db3204fb962a555775176a1c498978ec530c Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 3 Oct 2019 06:48:29 -0700 Subject: [PATCH] Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c am: 6982d1aec5 am: 6c3213c940 am: afc577e108 Change-Id: I54f2e01bf8ffe43dbe786a73cfd7818661230090 (cherry picked from commit fc8d43692ca2d42c4de724e7992d2ca5478b81f2) --- .../passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h b/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h index 18fbb6d035..8540068a48 100644 --- a/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h +++ b/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h @@ -37,6 +37,10 @@ class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl { Error validateBufferSize(const native_handle_t* bufferHandle, const IMapper::BufferDescriptorInfo& descriptorInfo, uint32_t stride) override { + if (descriptorInfo.layerCount != 1) { + return Error::BAD_VALUE; + } + if (!mModule->validateBufferSize) { return Error::NONE; }