Merge "Fix crash when decoding bitmap" into jb-dev (b3482ffb) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)