Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev

1 files changed, 2 insertions, 0 deletions

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index b171a7eb1f9f..637f7b1437f9 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -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;
     }