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

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

am 1e2f56c5: am e8556de6: am 36960fad: Merge "Decoder only returns true on... 

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

* commit '1e2f56c5':
  Decoder only returns true on complete success.
parents 75d0e2d7 1e2f56c5

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");

    }