commit 6982d1aec55dd61f353d90166ca76ab92518bae9
author Alistair Delva <adelva@google.com> Thu Oct 03 06:29:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 06:29:36 2019 -0700
tree ba1a0fa4c63cefc748669387776edae3c1456687
parent a53b19fb085eca7ce8363a9900755016daa24c7e
parent b756e23e5cdd7d1eb9372e476a0a83e725a32734

Merge "Make gralloc0 pass-through mapper handle layers"
am: b756e23e5c

Change-Id: I9f5948a862ead71ed745cf1cfca8df2088b3ab59

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