| commit | fc8d43692ca2d42c4de724e7992d2ca5478b81f2 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <adelva@google.com> | Thu Oct 03 06:48:29 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 03 06:48:29 2019 -0700 |
| tree | 5e5757b8b50ae48ddff2e8b13b5bed61ced4d6d4 | |
| parent | 6502c57b925d979386f1a8fa34183dadaea2a740 [diff] | |
| parent | afc577e1081ddadb5fdad0a6d13b4e918f20773b [diff] |
Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c am: 6982d1aec5 am: 6c3213c940 am: afc577e108 Change-Id: I54f2e01bf8ffe43dbe786a73cfd7818661230090
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 18fbb6d..8540068 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 @@ 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; }