commit 959516a8858e6d2ff02b5ed48021bd5324d4f912
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 16 17:12:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 16 17:12:22 2017 +0000
tree ecf3c0cf04dbb36eac40146cc5402177f5d1ba8a
parent 0b57d2f5616f051cd43d96de5382631d2d46aea4
parent f3a0299753dffe3cd79d62b99001754fe6dbf524

Merge "Throw OOME if Bitmap.nativeCreate fails"

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 635eed3..5498a93 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -682,6 +682,8 @@
 
     sk_sp<Bitmap> nativeBitmap = Bitmap::allocateHeapBitmap(&bitmap);
     if (!nativeBitmap) {
+        ALOGE("OOM allocating Bitmap with dimensions %i x %i", width, height);
+        doThrowOOME(env);
         return NULL;
     }