[android] - wrap jni callback with try-catch

1 files changed, 13 insertions, 7 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 328b5f6bcb..1236d932e5 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -1055,15 +1055,21 @@ final class NativeMapView implements NativeMap {
     if (checkState("OnSnapshotReady")) {
       return;
     }
-    if (snapshotReadyCallback != null && mapContent != null) {
-      if (viewCallback == null) {
-        snapshotReadyCallback.onSnapshotReady(mapContent);
-      } else {
-        Bitmap viewContent = viewCallback.getViewContent();
-        if (viewContent != null) {
-          snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent));
+
+    try {
+      if (snapshotReadyCallback != null && mapContent != null) {
+        if (viewCallback == null) {
+          snapshotReadyCallback.onSnapshotReady(mapContent);
+        } else {
+          Bitmap viewContent = viewCallback.getViewContent();
+          if (viewContent != null) {
+            snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent));
+          }
         }
       }
+    } catch (Throwable err) {
+      Logger.e(TAG, "Exception in onSnapshotReady", err);
+      throw err;
     }
   }