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

Commit 1cc94dd6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix NPE checkjni" into nyc-dev am: 2a12c6c2 am: 660874d1" into nyc-mr1-dev-plus-aosp

parents a908cb79 f848f642

core/java/android/view/DisplayListCanvas.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.CanvasProperty;
@@ -184,7 +185,7 @@ public class DisplayListCanvas extends Canvas { 
     * any references to the functor, just that the reference from this specific

     * canvas's display list has been released.

     */

    public void drawGLFunctor2(long drawGLFunctor, Runnable releasedCallback) {

    public void drawGLFunctor2(long drawGLFunctor, @Nullable Runnable releasedCallback) {

        nCallDrawGLFunction(mNativeCanvasWrapper, drawGLFunctor, releasedCallback);

    }

core/jni/android_view_DisplayListCanvas.cpp

+4 −2
Original line number Diff line number Diff line
@@ -105,8 +105,10 @@ static void android_view_DisplayListCanvas_callDrawGLFunction(JNIEnv* env, jobje 
        jlong canvasPtr, jlong functorPtr, jobject releasedCallback) {

    Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr);

    Functor* functor = reinterpret_cast<Functor*>(functorPtr);

    sp<GlFunctorReleasedCallbackBridge> bridge(new GlFunctorReleasedCallbackBridge(

            env, releasedCallback));

    sp<GlFunctorReleasedCallbackBridge> bridge;

    if (releasedCallback) {

        bridge = new GlFunctorReleasedCallbackBridge(env, releasedCallback);

    }

    canvas->callDrawGLFunction(functor, bridge.get());

}