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

Commit 66db8f0e authored by Songyue Han's avatar Songyue Han Committed by Gerrit Code Review
Browse files

Merge "Adding nullptr check in Image_getHardwareBuffer() and Image_getFormat()." into main

parents 70e8833a 01fc279c

media/jni/android_media_ImageReader.cpp

+10 −0
Original line number Diff line number Diff line
@@ -935,6 +935,11 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz, jint readerFormat) 
        return static_cast<jint>(PublicFormat::PRIVATE);

    } else {

        BufferItem* buffer = Image_getBufferItem(env, thiz);

        if (buffer == nullptr) {

            jniThrowException(env, "java/lang/IllegalStateException",

                    "Image is not initialized");

            return -1;

        }

        int readerHalFormat = mapPublicFormatToHalFormat(static_cast<PublicFormat>(readerFormat));

        int32_t fmt = applyFormatOverrides(

                buffer->mGraphicBuffer->getPixelFormat(), readerHalFormat);
@@ -953,6 +958,11 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz, jint readerFormat) 


static jobject Image_getHardwareBuffer(JNIEnv* env, jobject thiz) {

    BufferItem* buffer = Image_getBufferItem(env, thiz);

    if (buffer == nullptr) {

        jniThrowException(env, "java/lang/IllegalStateException",

                "Image is not initialized");

        return NULL;

    }

    AHardwareBuffer* b = AHardwareBuffer_from_GraphicBuffer(buffer->mGraphicBuffer.get());

    // don't user the public AHardwareBuffer_toHardwareBuffer() because this would force us

    // to link against libandroid.so