[android] - try/catch invocation of cancelcallbackupstream/tvn-try-catch-cancel-callback

1 files changed, 10 insertions, 5 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index 16c45ebea2..8c3cf2bc95 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -172,11 +172,16 @@ final class Transform implements MapView.OnMapChangedListener {
     // notify user about cancel
     cameraChangeDispatcher.onCameraMoveCanceled();
 
-    // notify animateCamera and easeCamera about cancelling
-    if (cameraCancelableCallback != null) {
-      cameraChangeDispatcher.onCameraIdle();
-      cameraCancelableCallback.onCancel();
-      cameraCancelableCallback = null;
+    try {
+      // notify animateCamera and easeCamera about cancelling
+      if (cameraCancelableCallback != null) {
+        cameraChangeDispatcher.onCameraIdle();
+        cameraCancelableCallback.onCancel();
+        cameraCancelableCallback = null;
+      }
+    } catch (NullPointerException exception) {
+      // see #10643
+      Timber.e("Couldn't invoke cameraCancelCallback#onCancel");
     }
 
     // cancel ongoing transitions