Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9091f869 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix VTS fail for GraphicsMapperHidlTest" am: eef384a8 am: a5439e22 

Change-Id: I1e37a94d78f6315ea6e0d2a3c32eee0ee0c3f8f6
parents 3458203c a5439e22

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

+6 −1
Original line number Diff line number Diff line
@@ -49,7 +49,12 @@ class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl<Hal> { 
                 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 {