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

Commit 660874d1 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Fix NPE checkjni" into nyc-dev 

am: 2a12c6c2

* commit '2a12c6c2':
  Fix NPE checkjni

Change-Id: I821051804cc79118acf1d55ec094353301c25ba2
parents 76e0d7dd 2a12c6c2

core/java/android/view/DisplayListCanvas.java

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

package android.view;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.CanvasProperty;

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

     * any references to the functor, just that the reference from this specific

     * canvas's display list has been released.

     * 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);

        nCallDrawGLFunction(mNativeCanvasWrapper, drawGLFunctor, releasedCallback);

    }

    }

core/jni/android_view_DisplayListCanvas.cpp

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

        jlong canvasPtr, jlong functorPtr, jobject releasedCallback) {

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

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

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

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

    sp<GlFunctorReleasedCallbackBridge> bridge(new GlFunctorReleasedCallbackBridge(

    sp<GlFunctorReleasedCallbackBridge> bridge;

            env, releasedCallback));

    if (releasedCallback) {

        bridge = new GlFunctorReleasedCallbackBridge(env, releasedCallback);

    }

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

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

}

}