diff options
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android_hardware_HardwareBuffer.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 96285cd4c17d..ceb3cc8b4ef5 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -234,6 +234,7 @@ LOCAL_STATIC_LIBRARIES := \ libseccomp_policy \ libselinux \ libcrypto \ + libgrallocusage \ LOCAL_SHARED_LIBRARIES := \ libmemtrack \ diff --git a/core/jni/android_hardware_HardwareBuffer.cpp b/core/jni/android_hardware_HardwareBuffer.cpp index ed0ab6054be7..4b31c91c708c 100644 --- a/core/jni/android_hardware_HardwareBuffer.cpp +++ b/core/jni/android_hardware_HardwareBuffer.cpp @@ -34,6 +34,7 @@ #include <private/gui/ComposerService.h> #include <hardware/gralloc1.h> +#include <grallocusage/GrallocUsageConversion.h> #include "core_jni_helpers.h" @@ -85,7 +86,7 @@ static jlong android_hardware_HardwareBuffer_create(JNIEnv* env, jobject clazz, &producerUsage, &consumerUsage, usage, 0); sp<GraphicBuffer> buffer = new GraphicBuffer(width, height, pixelFormat, layers, - producerUsage, consumerUsage, + android_convertGralloc1To0Usage(producerUsage, consumerUsage), std::string("HardwareBuffer pid [") + std::to_string(getpid()) +"]"); status_t error = buffer->initCheck(); if (error < 0) { |