Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "jni: Adjust for libui gralloc flags change" into oc-dev

Browse Source 
am: 3b7c1a32f1

Change-Id: Ib3c4d82de642f7db58bf1ce2729df1b1cf934e55
This commit is contained in:
Chris Forbes
2017-04-25 04:19:27 +00:00
committed by android-build-merger
parent f9b00d77b8 3b7c1a32f1
commit d8b8a23dc9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.mk
View File

@@ -234,6 +234,7 @@ LOCAL_STATIC_LIBRARIES := \
libseccomp_policy \ libseccomp_policy \
libselinux \ libselinux \
libcrypto \ libcrypto \
libgrallocusage \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libmemtrack \ libmemtrack \

3
core/jni/android_hardware_HardwareBuffer.cpp
View File

@@ -34,6 +34,7 @@
#include <private/gui/ComposerService.h> #include <private/gui/ComposerService.h>
#include <hardware/gralloc1.h> #include <hardware/gralloc1.h>
#include <grallocusage/GrallocUsageConversion.h>
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
@@ -85,7 +86,7 @@ static jlong android_hardware_HardwareBuffer_create(JNIEnv* env, jobject clazz,
&producerUsage, &consumerUsage, usage, 0); &producerUsage, &consumerUsage, usage, 0);
sp<GraphicBuffer> buffer = new GraphicBuffer(width, height, pixelFormat, layers, sp<GraphicBuffer> buffer = new GraphicBuffer(width, height, pixelFormat, layers,
producerUsage, consumerUsage, android_convertGralloc1To0Usage(producerUsage, consumerUsage),
std::string("HardwareBuffer pid [") + std::to_string(getpid()) +"]"); std::string("HardwareBuffer pid [") + std::to_string(getpid()) +"]");
status_t error = buffer->initCheck(); status_t error = buffer->initCheck();
if (error < 0) { if (error < 0) {