Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-04-18 18:04:18 +00:00
committed by Android (Google) Code Review
parent a908cb7999 f848f64224
commit 1cc94dd6e5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/DisplayListCanvas.java
View File

@@ -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);
} }

6
core/jni/android_view_DisplayListCanvas.cpp
View File

@@ -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());
} }