From 5e01b1411afdecc94ab7e60b92ad02672eb5f759 Mon Sep 17 00:00:00 2001
From: Valerie Hau <vhau@google.com>
Date: Tue, 23 Apr 2019 22:53:06 +0000
Subject: [PATCH] Revert "Call into validateBufferSize and getTransportSize"

This reverts commit 69ee26a3891b8652c8c67fc8f8a262368f6fa7ff.

Reason for revert: Break in Elfin

Bug: 130669566
Change-Id: Ia44fd087981770676a6887aa390c674c2855f4cb
---
 .../mapper-passthrough/2.1/Gralloc0Hal.h      | 48 +++++++------------
 1 file changed, 17 insertions(+), 31 deletions(-)

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 18fbb6d035..b704fdba4c 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
@@ -34,48 +34,34 @@ using V2_0::Error;
 template <typename Hal>
 class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl<Hal> {
    public:
-     Error validateBufferSize(const native_handle_t* bufferHandle,
-                              const IMapper::BufferDescriptorInfo& descriptorInfo,
-                              uint32_t stride) override {
-         if (!mModule->validateBufferSize) {
-             return Error::NONE;
-         }
+    Error validateBufferSize(const native_handle_t* /*bufferHandle*/,
+                             const IMapper::BufferDescriptorInfo& /*descriptorInfo*/,
+                             uint32_t /*stride*/) override {
+        // need a gralloc0 extension to really validate
+        return Error::NONE;
+    }
 
-         int32_t ret = mModule->validateBufferSize(
-                 mModule, bufferHandle, descriptorInfo.width, descriptorInfo.height,
-                 static_cast<int32_t>(descriptorInfo.format),
-                 static_cast<uint64_t>(descriptorInfo.usage), stride);
-         return static_cast<Error>(ret);
-     }
-     Error getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,
-                            uint32_t* outNumInts) override {
-         if (!mModule->getTransportSize) {
-             *outNumFds = bufferHandle->numFds;
-             *outNumInts = bufferHandle->numInts;
-             return Error::NONE;
-         }
-
-         int32_t ret = mModule->getTransportSize(mModule, bufferHandle, outNumFds, outNumInts);
-         return static_cast<Error>(ret);
+    Error getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,
+                           uint32_t* outNumInts) override {
+        // need a gralloc0 extension to get the transport size
+        *outNumFds = bufferHandle->numFds;
+        *outNumInts = bufferHandle->numInts;
+        return Error::NONE;
     }
 
     Error createDescriptor_2_1(const IMapper::BufferDescriptorInfo& descriptorInfo,
                                BufferDescriptor* outDescriptor) override {
         return createDescriptor(
-                V2_0::IMapper::BufferDescriptorInfo{
-                        descriptorInfo.width,
-                        descriptorInfo.height,
-                        descriptorInfo.layerCount,
-                        static_cast<common::V1_0::PixelFormat>(descriptorInfo.format),
-                        descriptorInfo.usage,
-                },
-                outDescriptor);
+            V2_0::IMapper::BufferDescriptorInfo{
+                descriptorInfo.width, descriptorInfo.height, descriptorInfo.layerCount,
+                static_cast<common::V1_0::PixelFormat>(descriptorInfo.format), descriptorInfo.usage,
+            },
+            outDescriptor);
     }
 
    private:
     using BaseType2_0 = V2_0::passthrough::detail::Gralloc0HalImpl<Hal>;
     using BaseType2_0::createDescriptor;
-    using BaseType2_0::mModule;
 };
 
 }  // namespace detail