commit 30425b854e011b3324cff57896e85bf9b80abd1b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 18 21:24:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 18 21:24:45 2020 +0000
tree 464b9010d1da9164a9ece6dca8ecc6047a649174
parent e93e85d1b636ae51966b27172cc9762891ca87bf
parent 9091f86903a1401bf2f36722416f533cf43eb0ae

Merge "Fix VTS fail for GraphicsMapperHidlTest" am: eef384a88e am: a5439e227c am: 9091f86903

Change-Id: I092c9b06535a4df77440e3a798bb079bc39418db

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 8540068..13df3bc 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
@@ -49,7 +49,12 @@
                  mModule, bufferHandle, descriptorInfo.width, descriptorInfo.height,
                  static_cast<int32_t>(descriptorInfo.format),
                  static_cast<uint64_t>(descriptorInfo.usage), stride);
-         return static_cast<Error>(ret);
+         if (ret == -EINVAL) {
+             return Error::BAD_BUFFER;
+         } else if (ret < 0) {
+             return Error::BAD_VALUE;
+         }
+         return Error::NONE;
      }
      Error getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,
                             uint32_t* outNumInts) override {