commit afc577e1081ddadb5fdad0a6d13b4e918f20773b
author Alistair Delva <adelva@google.com> Thu Oct 03 06:41:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 06:41:48 2019 -0700
tree 0aa61b88c6c8b46db4134f4001c853950d716691
parent 2b1e5cb620d940c06791465ddca77db764632f00
parent 6c3213c94032b60c7877ae1fba8aa161c7c2bdc0

Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c am: 6982d1aec5
am: 6c3213c940

Change-Id: I4a2289ef124970485b6ae273131f9ed33bec20bc

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