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

Commit ae84e20b authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null... 

am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

* commit '4375e848':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
parents 2c4e44b3 4375e848

media/jni/android_media_MediaMetadataRetriever.cpp

+7 −0
Original line number Diff line number Diff line
@@ -273,6 +273,13 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, 
                            width,

                            height,

                            config);

    if (jBitmap == NULL) {

        if (env->ExceptionCheck()) {

            env->ExceptionClear();

        }

        ALOGE("getFrameAtTime: create Bitmap failed!");

        return NULL;

    }



    SkBitmap *bitmap =

            (SkBitmap *) env->GetLongField(jBitmap, fields.nativeBitmap);