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

* commit 'b3482ffbeee30650359e6ab8f3950a83e06963b4':
  Fix crash when decoding bitmap

core/jni/android/graphics/BitmapFactory.cpp

@@ -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)