commit 4afbed15f3b4f88c0190bbb89deba7a6ceae2da7
author John Reck <jreck@google.com> Mon Apr 18 09:29:36 2016 -0700
committer John Reck <jreck@google.com> Mon Apr 18 10:35:08 2016 -0700
tree 0a7251d847cbc7c222bfa5af3700cfca8fee9fdb
parent 7d0b8d792886b2ed5ff89ac6c2723fba9d44c7d4

Fix NPE checkjni

Fixes: 28240259

releasedCallback can be null, which we need to check for

Change-Id: Ib218e1c624be8734db5722fc625ebbd72fa099ec

core/jni/android_view_DisplayListCanvas.cpp

diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp
index cadfd3d..d6f9db5 100644
--- a/core/jni/android_view_DisplayListCanvas.cpp
+++ b/core/jni/android_view_DisplayListCanvas.cpp
@@ -105,8 +105,10 @@
         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());
 }