Commit 5906a486 authored Oct 03, 2017 by Leon Scroggins III Committed by Leon Scroggins Oct 16, 2017

Throw OOME if Bitmap.nativeCreate fails

Bug:33846679
Test: I6ab6cb7a3b3151641a9f9b02b0bfc484e0a4524b

This matches the old behavior, prior to switching from Java allocated
pixel memory to native allocations (b/27762775). It also better matches
what has happened - we ran out of memory. (Better than the current
behavior - NullPointerException in the Java code, or an alternative
solution of returning null, which would likely result in NPEs in the
calling code.)

Merged-In: I3958ed1106ac94fb1d3f30e044b620d984875211
Change-Id: I3958ed1106ac94fb1d3f30e044b620d984875211

parent 995627c3

core/jni/android/graphics/Bitmap.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,8 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,

		sk_sp<Bitmap> nativeBitmap = Bitmap::allocateHeapBitmap(&bitmap, NULL);
		if (!nativeBitmap) {
		ALOGE("OOM allocating Bitmap with dimensions %i x %i", width, height);
		doThrowOOME(env);
		return NULL;
		}