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

Commit a1520e3a authored by Songyue Han's avatar Songyue Han Committed by Automerger Merge Worker
Browse files

Merge "Adding nullptr check in Image_getHardwareBuffer() and... 

Merge "Adding nullptr check in Image_getHardwareBuffer() and Image_getFormat()." into main am: 66db8f0e am: 22fcc65d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3292669



Change-Id: Ic0bb31011e7802bb268ba503052e52e9774a9703
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0de1ecd 22fcc65d

media/jni/android_media_ImageReader.cpp

+10 −0
Original line number Diff line number Diff line
@@ -942,6 +942,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);
@@ -960,6 +965,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