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

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

am 7bd44d97: am b3482ffb: Merge "Fix crash when decoding bitmap" into jb-dev 

* commit '7bd44d97':
  Fix crash when decoding bitmap
parents 3ed259a4 7bd44d97

core/jni/android/graphics/BitmapFactory.cpp

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,9 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, 
        // already have a pixelref installed.

        pr = bitmap->pixelRef();

    }

    if (pr == NULL) {

        return nullObjectReturn("Got null SkPixelRef");

    }



    if (!isMutable) {

        // promise we will never change our pixels (great for sharing and pictures)