Merge "Fix for native crash on image decode OOM" into jb-mr1-dev (3034d451) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,9 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,

		bitmap->setConfig(config, scaledWidth, scaledHeight);
		bitmap->setIsOpaque(decoded->isOpaque());
		bitmap->allocPixels(&javaAllocator, NULL);
		if (!bitmap->allocPixels(&javaAllocator, NULL)) {
		return nullObjectReturn("allocation failed for scaled bitmap");
		}
		bitmap->eraseColor(0);

		SkPaint paint;