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

Commit 2b5edf65 authored by Bo Liu's avatar Bo Liu Committed by Android Git Automerger
Browse files

am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas... 

am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev

* commit '88309159':
  Fix crash in getNativeCanvas when canvasHandle is NULL
parents 58383869 88309159

core/jni/android/graphics/Graphics.cpp

+3 −0
Original line number Diff line number Diff line
@@ -361,6 +361,9 @@ SkCanvas* GraphicsJNI::getNativeCanvas(JNIEnv* env, jobject canvas) { 
    SkASSERT(canvas);

    SkASSERT(env->IsInstanceOf(canvas, gCanvas_class));

    jlong canvasHandle = env->GetLongField(canvas, gCanvas_nativeInstanceID);

    if (!canvasHandle) {

        return NULL;

    }

    SkCanvas* c = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();

    SkASSERT(c);

    return c;