Merge "Decoder only returns true on complete success." into lmp-mr1-dev (36960fad) · Commits · e / os / android_frameworks_base

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