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

Commit d8b8a23d authored by Chris Forbes's avatar Chris Forbes Committed by android-build-merger
Browse files

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

am: 3b7c1a32

Change-Id: Ib3c4d82de642f7db58bf1ce2729df1b1cf934e55
parents f9b00d77 3b7c1a32

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libseccomp_policy \

    libselinux \

    libcrypto \

    libgrallocusage \



LOCAL_SHARED_LIBRARIES := \

    libmemtrack \

core/jni/android_hardware_HardwareBuffer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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) {