commit e8556de6f82ae0f4e4c8e76679e94abc23d724cf
author Leon Scroggins III <scroggo@google.com> Wed Oct 22 21:56:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 22 21:56:13 2014 +0000
tree bae5db80ee0fa4bb4b43a8bde2a9a1d998482719
parent a86aa5d14b849fa9c57ed9a3d06a5ee21b2ea239
parent 36960fad6631f3cb5f2c6048e482e19319b6b2d3

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

* commit '36960fad6631f3cb5f2c6048e482e19319b6b2d3':
  Decoder only returns true on complete success.

core/jni/android/graphics/BitmapFactory.cpp

diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index e0abc24..a578b5d 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -315,7 +315,8 @@
     }
 
     SkBitmap decodingBitmap;
-    if (!decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)) {
+    if (decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)
+                != SkImageDecoder::kSuccess) {
         return nullObjectReturn("decoder->decode returned false");
     }