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

Commit e8556de6 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android Git Automerger
Browse files

am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev 

* commit '36960fad':
  Decoder only returns true on complete success.
parents a86aa5d1 36960fad

core/jni/android/graphics/BitmapFactory.cpp

+2 −1
Original line number Diff line number Diff line
@@ -315,7 +315,8 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding 
    }



    SkBitmap decodingBitmap;

    if (!decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)) {

    if (decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)

                != SkImageDecoder::kSuccess) {

        return nullObjectReturn("decoder->decode returned false");

    }