Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fe26063 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by android-build-merger
Browse files

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

am: c4049e24

Change-Id: I7636d9eaf3983fc7ed0c1dc59ec2671ff762206e
parents 43c494cb c4049e24

core/jni/android/graphics/Bitmap.cpp

+2 −0
Original line number Diff line number Diff line
@@ -740,6 +740,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;

    }