summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-04-18 09:29:36 -0700
committerJohn Reck <jreck@google.com>2016-04-18 10:35:08 -0700
commit4afbed15f3b4f88c0190bbb89deba7a6ceae2da7 (patch)
tree0a7251d847cbc7c222bfa5af3700cfca8fee9fdb /core/java/android
parent7d0b8d792886b2ed5ff89ac6c2723fba9d44c7d4 (diff)
Fix NPE checkjni
Fixes: 28240259 releasedCallback can be null, which we need to check for Change-Id: Ib218e1c624be8734db5722fc625ebbd72fa099ec
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/DisplayListCanvas.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/DisplayListCanvas.java b/core/java/android/view/DisplayListCanvas.java
index 2481e049933b..415c29107a94 100644
--- a/core/java/android/view/DisplayListCanvas.java
+++ b/core/java/android/view/DisplayListCanvas.java
@@ -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);
}