Merge "Fix NPE in BitmapFactory when an allocation of hw bitmap failed" (0b513504) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -579,6 +579,9 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding

		if (isHardware) {
		sk_sp<Bitmap> hardwareBitmap = Bitmap::allocateHardwareBitmap(outputBitmap);
		if (!hardwareBitmap.get()) {
		return nullObjectReturn("Failed to allocate a hardware bitmap");
		}
		return bitmap::createBitmap(env, hardwareBitmap.release(), bitmapCreateFlags,
		ninePatchChunk, ninePatchInsets, -1);
		}