Revert "Remove use of deprecated gralloc APIs."

This reverts commit 2892c7487da7780e0135978e709359f6d75e19b8.

Change-Id: Ide39986581c399902dfcfa914ff7c7aa7dbefa8c

3 files changed, 4 insertions, 24 deletions

diff --git a/ISV/Android.mk b/ISV/Android.mk
index 168b532..07cf4c7 100644
--- a/ISV/Android.mk
+++ b/ISV/Android.mk
@@ -26,11 +26,9 @@ LOCAL_SHARED_LIBRARIES := \
     libva-android \
     libmrm_omx_adaptor \
     libmedia \
-    libsync \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
-    system/core/libsync/include \
     $(call include-path-for, frameworks-openmax) \
     $(TARGET_OUT_HEADERS)/libmedia_utils_vpp \
     $(TARGET_OUT_HEADERS)/display \
diff --git a/ISV/base/isv_bufmanager.cpp b/ISV/base/isv_bufmanager.cpp
index 8e5aa2d..3b02ab4 100644
--- a/ISV/base/isv_bufmanager.cpp
+++ b/ISV/base/isv_bufmanager.cpp
@@ -22,7 +22,6 @@
 #include "isv_bufmanager.h"
 #ifndef TARGET_VPP_USE_GEN
 #include "hal_public.h"
-#include <sync/sync.h>
 #endif
 
 //#define LOG_NDEBUG 0
@@ -70,12 +69,12 @@ status_t ISVBuffer::initBufferInfo(uint32_t hackFormat)
     }
 
     int32_t err = 0;
-#ifdef TARGET_VPP_USE_GEN
     if (!mpGralloc) {
         err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (hw_module_t const**)&mpGralloc);
         if (0 != err)
             return UNKNOWN_ERROR;
     }
+#ifdef TARGET_VPP_USE_GEN
     ufo_buffer_details_t info;
 
     memset(&info, 0, sizeof(ufo_buffer_details_t));
@@ -89,11 +88,6 @@ status_t ISVBuffer::initBufferInfo(uint32_t hackFormat)
     mStride = info.pitch;
     mColorFormat = info.format;
 #else
-    if (!mpGralloc) {
-        err = gralloc_open_img(&mpGralloc);
-        if (0 != err)
-            return UNKNOWN_ERROR;
-    }
     IMG_native_handle_t* grallocHandle = (IMG_native_handle_t*)mGrallocHandle;
     mStride = grallocHandle->aiStride[0];
     mSurfaceHeight = grallocHandle->iHeight;
@@ -132,13 +126,9 @@ status_t ISVBuffer::clearIfNeed()
     if ((mFlags & ISV_BUFFER_NEED_CLEAR) && mpGralloc) {
         int32_t usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN;
         void *vaddr[GRALLOC_SUB_BUFFER_MAX];
-        const gralloc1_rect_t r = {
-            .width  = (int32_t)mStride,
-            .height = (int32_t)mSurfaceHeight
-        };
-        int err, releaseFence = -1;
 
-        err = gralloc_lock_async_img(mpGralloc, (buffer_handle_t)mGrallocHandle, usage, &r, &vaddr[0], -1);
+        int32_t err = mpGralloc->lock(mpGralloc, (buffer_handle_t)mGrallocHandle, usage, 0, 0, mStride, mSurfaceHeight, &vaddr[0]);
+
         if (0 != err) {
             ALOGE("%s: get graphic buffer ptr failed", __func__);
             return UNKNOWN_ERROR;
@@ -150,11 +140,7 @@ status_t ISVBuffer::clearIfNeed()
             memcpy(ptr, random_buf, sizeof(random_buf));
             ptr += sizeof(random_buf);
         }
-        gralloc_unlock_async_img(mpGralloc, (buffer_handle_t)mGrallocHandle, &releaseFence);
-        if (releaseFence >= 0) {
-            sync_wait(releaseFence, -1);
-            close(releaseFence);
-        }
+        mpGralloc->unlock(mpGralloc, (buffer_handle_t)mGrallocHandle);
         ALOGD_IF(ISV_BUFFER_MANAGER_DEBUG, "%s: clear isv buffer %p finished, buffer size %d", __func__, this, buffer_size);
         mFlags &= ~ISV_BUFFER_NEED_CLEAR;
     }
diff --git a/ISV/include/isv_bufmanager.h b/ISV/include/isv_bufmanager.h
index 7b0bfb0..18c3209 100644
--- a/ISV/include/isv_bufmanager.h
+++ b/ISV/include/isv_bufmanager.h
@@ -134,11 +134,7 @@ private:
     ISV_BUFFERTYPE mType;
     int32_t mSurface;
     uint32_t mFlags;
-#ifdef TARGET_VPP_USE_GEN
     gralloc_module_t* mpGralloc;
-#else
-    const hw_device_t* mpGralloc;
-#endif
 };
 
 class ISVBufferManager: public RefBase