commit b756e23e5cdd7d1eb9372e476a0a83e725a32734
author Alistair Delva <adelva@google.com> Thu Oct 03 13:02:13 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 03 13:02:13 2019 +0000
tree 51bc83f843df131210070d74273da3ab3fa185bf
parent 86331df20a46d77deaa75e2b6c54ce2cda3ae401
parent 8b5b9fb52c7af7972fecb6ca9213ddd38237fda1

Merge "Make gralloc0 pass-through mapper handle layers"

graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h

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;
          }