1 files changed, 9 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 6be45e3000..457353d4b9 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
@@ -30,7 +30,9 @@ final class Transform implements MapView.OnCameraDidChangeListener {
   private final MarkerViewManager markerViewManager;
   private final Handler handler = new Handler();
 
+  @Nullable
   private CameraPosition cameraPosition;
+  @Nullable
   private MapboxMap.CancelableCallback cameraCancelableCallback;
 
   private CameraChangeDispatcher cameraChangeDispatcher;
@@ -66,6 +68,7 @@ final class Transform implements MapView.OnCameraDidChangeListener {
   // Camera API
   //
 
+  @Nullable
   @UiThread
   public final CameraPosition getCameraPosition() {
     if (cameraPosition == null) {
@@ -100,7 +103,8 @@ final class Transform implements MapView.OnCameraDidChangeListener {
   }
 
   @UiThread
-  final void moveCamera(MapboxMap mapboxMap, CameraUpdate update, final MapboxMap.CancelableCallback callback) {
+  final void moveCamera(@NonNull MapboxMap mapboxMap, CameraUpdate update,
+                        @Nullable final MapboxMap.CancelableCallback callback) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (isValidCameraPosition(cameraPosition)) {
       cancelTransitions();
@@ -120,8 +124,8 @@ final class Transform implements MapView.OnCameraDidChangeListener {
   }
 
   @UiThread
-  final void easeCamera(MapboxMap mapboxMap, CameraUpdate update, int durationMs, boolean easingInterpolator,
-                        final MapboxMap.CancelableCallback callback) {
+  final void easeCamera(@NonNull MapboxMap mapboxMap, CameraUpdate update, int durationMs, boolean easingInterpolator,
+                        @Nullable final MapboxMap.CancelableCallback callback) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (isValidCameraPosition(cameraPosition)) {
       cancelTransitions();
@@ -137,8 +141,8 @@ final class Transform implements MapView.OnCameraDidChangeListener {
   }
 
   @UiThread
-  final void animateCamera(MapboxMap mapboxMap, CameraUpdate update, int durationMs,
-                           final MapboxMap.CancelableCallback callback) {
+  final void animateCamera(@NonNull MapboxMap mapboxMap, CameraUpdate update, int durationMs,
+                           @Nullable final MapboxMap.CancelableCallback callback) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (isValidCameraPosition(cameraPosition)) {
       cancelTransitions();