handle null surface holder

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -785,8 +785,11 @@ public void onPermissionsGranted() {
   // TODO this is only used by A2D, when finishing up a draw. but if the
   // surfaceview has changed, then it might belong to an a3d surfaceview. hrm.
   public SurfaceHolder getSurfaceHolder() {
-    return surfaceView.getHolder();
-//    return surfaceHolder;
+    if (surfaceView != null) {
+      return surfaceView.getHolder();
+    } else {
+      return null;
+    }
   }
 
 

core/src/processing/core/PGraphicsAndroid2D.java

@@ -33,6 +33,7 @@
 import android.graphics.*;
 import android.graphics.Bitmap.Config;
 import android.graphics.Paint.Style;
+import android.view.SurfaceHolder;
 
 
 /**
@@ -208,17 +209,21 @@ public void endDraw() {
 //    }
 
     if (primaryGraphics) {
-      Canvas screen = null;
-      try {
-        screen = parent.getSurfaceHolder().lockCanvas(null);
-        if (screen != null) {
-          screen.drawBitmap(bitmap, new Matrix(), null);
-        }
-      } finally {
-        if (screen != null) {
-          parent.getSurfaceHolder().unlockCanvasAndPost(screen);
+      SurfaceHolder holder = parent.getSurfaceHolder();
+      if (holder != null) {
+        Canvas screen = null;
+        try {
+          screen = holder.lockCanvas(null);
+          if (screen != null) {
+            screen.drawBitmap(bitmap, new Matrix(), null);
+          }
+        } finally {
+          if (screen != null) {
+            holder.unlockCanvasAndPost(screen);
+          }
         }
       }
+
     } else {
       // TODO this is probably overkill for most tasks...
       loadPixels();