[android] - nullify codebase with annotations

24 files changed, 153 insertions, 41 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java
index ea1817ab5e..4bb20ba5a0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 
 import java.util.List;
 
@@ -16,7 +17,7 @@ class CameraCompassBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.On
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnCameraAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewCompassBearingValue((Float) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java
index f46cf805ff..bd8e153d6e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 
 import java.util.List;
 
@@ -15,7 +16,7 @@ class CameraGpsBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.OnCame
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnCameraAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewGpsBearingValue((Float) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java
index 533abfc335..8e515b85c8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
 
+import android.support.annotation.NonNull;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
 import java.util.List;
@@ -17,7 +18,7 @@ class CameraLatLngAnimator extends MapboxLatLngAnimator<MapboxAnimator.OnCameraA
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnCameraAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewLatLngValue((LatLng) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java
index fa966641fd..c631b1b75d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java
@@ -2,14 +2,16 @@ package com.mapbox.mapboxsdk.location;
 
 import android.animation.TypeEvaluator;
 
+import android.support.annotation.NonNull;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
 class LatLngEvaluator implements TypeEvaluator<LatLng> {
 
   private final LatLng latLng = new LatLng();
 
+  @NonNull
   @Override
-  public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
+  public LatLng evaluate(float fraction, @NonNull LatLng startValue, @NonNull LatLng endValue) {
     latLng.setLatitude(startValue.getLatitude()
       + ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
     latLng.setLongitude(startValue.getLongitude()
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java
index e893f0fee9..90ed9a0603 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 
 import java.util.List;
 
@@ -16,7 +17,7 @@ class LayerAccuracyAnimator extends MapboxFloatAnimator<MapboxAnimator.OnLayerAn
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnLayerAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewAccuracyRadiusValue((Float) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java
index 6c9f063c18..4e25a082b9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 
 import com.mapbox.mapboxsdk.R;
@@ -26,7 +27,7 @@ class LayerBitmapProvider {
     return getBitmapFromDrawable(drawable);
   }
 
-  Bitmap generateShadowBitmap(LocationComponentOptions options) {
+  Bitmap generateShadowBitmap(@NonNull LocationComponentOptions options) {
     Drawable shadowDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_user_icon_shadow);
     return generateShadow(shadowDrawable, options.elevation());
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java
index e75eaca2b5..3b06e0e174 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 
 import java.util.List;
 
@@ -16,7 +17,7 @@ class LayerCompassBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.OnL
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnLayerAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewCompassBearingValue((Float) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java
index 0be38dc4db..faa83ea0e9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java
@@ -13,7 +13,7 @@ import static com.mapbox.mapboxsdk.location.LocationComponentConstants.PROPERTY_
 class LayerFeatureProvider {
 
   @NonNull
-  Feature generateLocationFeature(@Nullable Feature locationFeature, LocationComponentOptions options) {
+  Feature generateLocationFeature(@Nullable Feature locationFeature, @NonNull LocationComponentOptions options) {
     if (locationFeature != null) {
       return locationFeature;
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java
index 75cea13750..6301f31ee5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 
 import java.util.List;
 
@@ -15,7 +16,7 @@ class LayerGpsBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.OnLayer
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnLayerAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewGpsBearingValue((Float) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java
index f4dc2861cf..6bfec87430 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
 
+import android.support.annotation.NonNull;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
 import java.util.List;
@@ -17,7 +18,7 @@ class LayerLatLngAnimator extends MapboxLatLngAnimator<MapboxAnimator.OnLayerAni
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnLayerAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewLatLngValue((LatLng) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java
index d6198a7da8..cac513c2f9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java
@@ -1,5 +1,6 @@
 package com.mapbox.mapboxsdk.location;
 
+import android.support.annotation.NonNull;
 import com.mapbox.geojson.Feature;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.Layer;
@@ -50,6 +51,7 @@ class LayerSourceProvider {
 
   private static final String EMPTY_STRING = "";
 
+  @NonNull
   GeoJsonSource generateSource(Feature locationFeature) {
     return new GeoJsonSource(
       LOCATION_SOURCE,
@@ -58,7 +60,8 @@ class LayerSourceProvider {
     );
   }
 
-  Layer generateLayer(String layerId) {
+  @NonNull
+  Layer generateLayer(@NonNull String layerId) {
     SymbolLayer layer = new SymbolLayer(layerId, LOCATION_SOURCE);
     layer.setProperties(
       iconAllowOverlap(true),
@@ -94,6 +97,7 @@ class LayerSourceProvider {
     return layer;
   }
 
+  @NonNull
   Layer generateAccuracyLayer() {
     return new CircleLayer(ACCURACY_LAYER, LOCATION_SOURCE)
       .withProperties(
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
index 0a6c9b5ddc..fd8537f23f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
@@ -295,18 +295,18 @@ final class LocationAnimatorCoordinator {
     locationAnimatorSet.start();
   }
 
-  void resetAllCameraAnimations(CameraPosition currentCameraPosition, boolean isGpsNorth) {
+  void resetAllCameraAnimations(@NonNull CameraPosition currentCameraPosition, boolean isGpsNorth) {
     resetCameraCompassAnimation(currentCameraPosition);
     boolean snap = resetCameraLocationAnimations(currentCameraPosition, isGpsNorth);
     playCameraLocationAnimators(snap ? 0 : TRANSITION_ANIMATION_DURATION_MS);
   }
 
-  private boolean resetCameraLocationAnimations(CameraPosition currentCameraPosition, boolean isGpsNorth) {
+  private boolean resetCameraLocationAnimations(@NonNull CameraPosition currentCameraPosition, boolean isGpsNorth) {
     resetCameraGpsBearingAnimation(currentCameraPosition, isGpsNorth);
     return resetCameraLatLngAnimation(currentCameraPosition);
   }
 
-  private boolean resetCameraLatLngAnimation(CameraPosition currentCameraPosition) {
+  private boolean resetCameraLatLngAnimation(@NonNull CameraPosition currentCameraPosition) {
     CameraLatLngAnimator animator = (CameraLatLngAnimator) animatorArray.get(ANIMATOR_CAMERA_LATLNG);
     if (animator == null) {
       return false;
@@ -320,7 +320,7 @@ final class LocationAnimatorCoordinator {
     return immediateAnimation(previousCameraTarget, currentTarget, currentCameraPosition.zoom);
   }
 
-  private void resetCameraGpsBearingAnimation(CameraPosition currentCameraPosition, boolean isGpsNorth) {
+  private void resetCameraGpsBearingAnimation(@NonNull CameraPosition currentCameraPosition, boolean isGpsNorth) {
     CameraGpsBearingAnimator animator = (CameraGpsBearingAnimator) animatorArray.get(ANIMATOR_CAMERA_GPS_BEARING);
     if (animator == null) {
       return;
@@ -334,7 +334,7 @@ final class LocationAnimatorCoordinator {
       new CameraGpsBearingAnimator(previousCameraBearing, normalizedCameraBearing, cameraListeners));
   }
 
-  private void resetCameraCompassAnimation(CameraPosition currentCameraPosition) {
+  private void resetCameraCompassAnimation(@NonNull CameraPosition currentCameraPosition) {
     CameraCompassBearingAnimator animator =
       (CameraCompassBearingAnimator) animatorArray.get(ANIMATOR_CAMERA_COMPASS_BEARING);
     if (animator == null) {
@@ -382,7 +382,7 @@ final class LocationAnimatorCoordinator {
     this.durationMultiplier = trackingAnimationDurationMultiplier;
   }
 
-  private boolean immediateAnimation(LatLng current, LatLng target, double zoom) {
+  private boolean immediateAnimation(LatLng current, @NonNull LatLng target, double zoom) {
     // TODO: calculate the value based on the projection
     double distance = current.distanceTo(target);
     if (zoom > 10) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
index e3194df009..7a20ca8177 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
@@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.location;
 import android.content.Context;
 import android.graphics.PointF;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.view.MotionEvent;
 
@@ -34,7 +35,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
     Context context,
     MapboxMap mapboxMap,
     OnCameraTrackingChangedListener internalCameraTrackingChangedListener,
-    LocationComponentOptions options,
+    @NonNull LocationComponentOptions options,
     OnCameraMoveInvalidateListener onCameraMoveInvalidateListener) {
     this.mapboxMap = mapboxMap;
 
@@ -92,7 +93,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
     onCameraMoveInvalidateListener.onInvalidateCameraMove();
   }
 
-  private void setLatLng(LatLng latLng) {
+  private void setLatLng(@NonNull LatLng latLng) {
     mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(latLng));
     onCameraMoveInvalidateListener.onInvalidateCameraMove();
   }
@@ -108,7 +109,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
   }
 
   @Override
-  public void onNewLatLngValue(LatLng latLng) {
+  public void onNewLatLngValue(@NonNull LatLng latLng) {
     if (cameraMode == CameraMode.TRACKING
       || cameraMode == CameraMode.TRACKING_COMPASS
       || cameraMode == CameraMode.TRACKING_GPS
@@ -187,6 +188,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
     }
   }
 
+  @NonNull
   @VisibleForTesting
   MapboxMap.OnMoveListener onMoveListener = new MapboxMap.OnMoveListener() {
     private boolean interrupt;
@@ -226,6 +228,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
     }
   };
 
+  @NonNull
   private MapboxMap.OnRotateListener onRotateListener = new MapboxMap.OnRotateListener() {
     @Override
     public void onRotateBegin(@NonNull RotateGestureDetector detector) {
@@ -245,6 +248,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
     }
   };
 
+  @NonNull
   private MapboxMap.OnFlingListener onFlingListener = new MapboxMap.OnFlingListener() {
     @Override
     public void onFling() {
@@ -259,7 +263,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent motionEvent) {
+    public boolean onTouchEvent(@Nullable MotionEvent motionEvent) {
       if (motionEvent != null) {
         int action = motionEvent.getActionMasked();
         if (action == MotionEvent.ACTION_UP) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
index 4e17268abb..3c0e8f7dc4 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
@@ -74,9 +74,12 @@ import static com.mapbox.mapboxsdk.location.LocationComponentConstants.DEFAULT_T
 public final class LocationComponent {
   private static final String TAG = "Mbgl-LocationComponent";
 
+  @NonNull
   private final MapboxMap mapboxMap;
   private LocationComponentOptions options;
+  @Nullable
   private LocationEngine locationEngine;
+  @Nullable
   private CompassEngine compassEngine;
   private boolean usingInternalLocationEngine;
 
@@ -89,6 +92,7 @@ public final class LocationComponent {
    * Holds last location which is being returned in the {@link #getLastKnownLocation()}
    * when there is no {@link #locationEngine} set or when the last location returned by the engine is null.
    */
+  @Nullable
   private Location lastLocation;
   private CameraPosition lastCameraPosition;
 
@@ -338,7 +342,7 @@ public final class LocationComponent {
    *
    * @param options to update the current style
    */
-  public void applyStyle(LocationComponentOptions options) {
+  public void applyStyle(@NonNull LocationComponentOptions options) {
     this.options = options;
     locationLayerController.applyStyle(options);
     locationCameraController.initializeOptions(options);
@@ -838,7 +842,7 @@ public final class LocationComponent {
    *
    * @param location the latest user location
    */
-  private void updateLocation(final Location location, boolean fromLastLocation) {
+  private void updateLocation(@Nullable final Location location, boolean fromLastLocation) {
     if (location == null) {
       return;
     } else if (!isLayerReady) {
@@ -909,6 +913,7 @@ public final class LocationComponent {
     locationAnimatorCoordinator.feedNewAccuracyRadius(Utils.calculateZoomLevelRadius(mapboxMap, location), noAnimation);
   }
 
+  @NonNull
   private OnCameraMoveListener onCameraMoveListener = new OnCameraMoveListener() {
     @Override
     public void onCameraMove() {
@@ -916,6 +921,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnCameraIdleListener onCameraIdleListener = new OnCameraIdleListener() {
     @Override
     public void onCameraIdle() {
@@ -923,6 +929,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnMapClickListener onMapClickListener = new OnMapClickListener() {
     @Override
     public boolean onMapClick(@NonNull LatLng point) {
@@ -936,6 +943,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private MapboxMap.OnMapLongClickListener onMapLongClickListener = new MapboxMap.OnMapLongClickListener() {
     @Override
     public boolean onMapLongClick(@NonNull LatLng point) {
@@ -949,6 +957,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnLocationStaleListener onLocationStaleListener = new OnLocationStaleListener() {
     @Override
     public void onStaleStateChange(boolean isStale) {
@@ -960,6 +969,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnCameraMoveInvalidateListener onCameraMoveInvalidateListener = new OnCameraMoveInvalidateListener() {
     @Override
     public void onInvalidateCameraMove() {
@@ -967,6 +977,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private CompassListener compassListener = new CompassListener() {
     @Override
     public void onCompassChanged(float userHeading) {
@@ -979,6 +990,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private LocationEngineListener locationEngineListener = new LocationEngineListener() {
     @Override
     @SuppressWarnings( {"MissingPermission"})
@@ -994,6 +1006,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnCameraTrackingChangedListener cameraTrackingChangedListener = new OnCameraTrackingChangedListener() {
     @Override
     public void onCameraTrackingDismissed() {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
index b53d909de3..b47f8d7afb 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
@@ -31,6 +31,7 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen
   private static final float ALPHA = 0.45f;
 
   private final WindowManager windowManager;
+  @NonNull
   private final SensorManager sensorManager;
   private final List<CompassListener> compassListeners = new ArrayList<>();
 
@@ -42,14 +43,18 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen
   @Nullable
   private Sensor magneticFieldSensor;
 
+  @NonNull
   private float[] truncatedRotationVectorValue = new float[4];
+  @NonNull
   private float[] rotationMatrix = new float[9];
   private float[] rotationVectorValue;
   private float lastHeading;
   private int lastAccuracySensorStatus;
 
   private long compassUpdateNextTimestamp;
+  @Nullable
   private float[] gravityValues = new float[3];
+  @Nullable
   private float[] magneticValues = new float[3];
 
   /**
@@ -109,7 +114,7 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen
   }
 
   @Override
-  public void onSensorChanged(SensorEvent event) {
+  public void onSensorChanged(@NonNull SensorEvent event) {
     // check when the last time the compass was updated, return if too soon.
     long currentTime = SystemClock.elapsedRealtime();
     if (currentTime < compassUpdateNextTimestamp) {
@@ -233,7 +238,8 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen
    * @param smoothedValues array of float, that contains previous state
    * @return float filtered array of float
    */
-  private float[] lowPassFilter(float[] newValues, float[] smoothedValues) {
+  @Nullable
+  private float[] lowPassFilter(@NonNull float[] newValues, @Nullable float[] smoothedValues) {
     if (smoothedValues == null) {
       return newValues;
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
index a3f8af34b2..ff4544aff2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
@@ -82,25 +82,37 @@ public class LocationComponentOptions implements Parcelable {
   private float accuracyAlpha;
   private int accuracyColor;
   private int backgroundDrawableStale;
+  @Nullable
   private String backgroundStaleName;
   private int foregroundDrawableStale;
+  @Nullable
   private String foregroundStaleName;
   private int gpsDrawable;
+  @Nullable
   private String gpsName;
   private int foregroundDrawable;
+  @Nullable
   private String foregroundName;
   private int backgroundDrawable;
+  @Nullable
   private String backgroundName;
   private int bearingDrawable;
+  @Nullable
   private String bearingName;
+  @Nullable
   private Integer bearingTintColor;
+  @Nullable
   private Integer foregroundTintColor;
+  @Nullable
   private Integer backgroundTintColor;
+  @Nullable
   private Integer foregroundStaleTintColor;
+  @Nullable
   private Integer backgroundStaleTintColor;
   private float elevation;
   private boolean enableStaleState;
   private long staleStateTimeout;
+  @Nullable
   private int[] padding;
   private double maxZoom;
   private double minZoom;
@@ -135,7 +147,7 @@ public class LocationComponentOptions implements Parcelable {
     float elevation,
     boolean enableStaleState,
     long staleStateTimeout,
-    int[] padding,
+    @Nullable int[] padding,
     double maxZoom,
     double minZoom,
     float maxZoomIconScale,
@@ -192,6 +204,7 @@ public class LocationComponentOptions implements Parcelable {
    * @return a new {@link LocationComponentOptions} object with the settings you defined in your style
    * resource
    */
+  @Nullable
   public static LocationComponentOptions createFromAttributes(@NonNull Context context,
                                                               @StyleRes int styleRes) {
 
@@ -316,6 +329,7 @@ public class LocationComponentOptions implements Parcelable {
    *
    * @return the builder which contains the values defined in this current instance as defaults.
    */
+  @NonNull
   public Builder toBuilder() {
     return new Builder(this);
   }
@@ -328,7 +342,8 @@ public class LocationComponentOptions implements Parcelable {
    * @param context your activities context used to acquire the style resource
    * @return the builder which contains the default values defined by the style resource
    */
-  public static Builder builder(Context context) {
+  @NonNull
+  public static Builder builder(@NonNull Context context) {
     return LocationComponentOptions.createFromAttributes(context,
       R.style.mapbox_LocationComponent).toBuilder();
   }
@@ -626,6 +641,7 @@ public class LocationComponentOptions implements Parcelable {
    *
    * @return integer array of padding values
    */
+  @Nullable
   @SuppressWarnings("mutable")
   public int[] padding() {
     return padding;
@@ -722,6 +738,7 @@ public class LocationComponentOptions implements Parcelable {
     return trackingAnimationDurationMultiplier;
   }
 
+  @NonNull
   @Override
   public String toString() {
     return "LocationComponentOptions{"
@@ -931,7 +948,7 @@ public class LocationComponentOptions implements Parcelable {
     };
 
   @Override
-  public void writeToParcel(Parcel dest, int flags) {
+  public void writeToParcel(@NonNull Parcel dest, int flags) {
     dest.writeFloat(accuracyAlpha());
     dest.writeInt(accuracyColor());
     dest.writeInt(backgroundDrawableStale());
@@ -1036,6 +1053,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @return a new instance of {@link LocationComponentOptions}
      */
+    @NonNull
     public LocationComponentOptions build() {
       LocationComponentOptions locationComponentOptions = autoBuild();
       if (locationComponentOptions.accuracyAlpha() < 0 || locationComponentOptions.accuracyAlpha() > 1) {
@@ -1054,25 +1072,37 @@ public class LocationComponentOptions implements Parcelable {
     private Float accuracyAlpha;
     private Integer accuracyColor;
     private Integer backgroundDrawableStale;
+    @Nullable
     private String backgroundStaleName;
     private Integer foregroundDrawableStale;
+    @Nullable
     private String foregroundStaleName;
     private Integer gpsDrawable;
+    @Nullable
     private String gpsName;
     private Integer foregroundDrawable;
+    @Nullable
     private String foregroundName;
     private Integer backgroundDrawable;
+    @Nullable
     private String backgroundName;
     private Integer bearingDrawable;
+    @Nullable
     private String bearingName;
+    @Nullable
     private Integer bearingTintColor;
+    @Nullable
     private Integer foregroundTintColor;
+    @Nullable
     private Integer backgroundTintColor;
+    @Nullable
     private Integer foregroundStaleTintColor;
+    @Nullable
     private Integer backgroundStaleTintColor;
     private Float elevation;
     private Boolean enableStaleState;
     private Long staleStateTimeout;
+    @Nullable
     private int[] padding;
     private Double maxZoom;
     private Double minZoom;
@@ -1130,6 +1160,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_accuracyAlpha
      */
+    @NonNull
     public LocationComponentOptions.Builder accuracyAlpha(float accuracyAlpha) {
       this.accuracyAlpha = accuracyAlpha;
       return this;
@@ -1142,6 +1173,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_accuracyColor
      */
+    @NonNull
     public LocationComponentOptions.Builder accuracyColor(int accuracyColor) {
       this.accuracyColor = accuracyColor;
       return this;
@@ -1154,6 +1186,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_backgroundDrawableStale
      */
+    @NonNull
     public LocationComponentOptions.Builder backgroundDrawableStale(int backgroundDrawableStale) {
       this.backgroundDrawableStale = backgroundDrawableStale;
       return this;
@@ -1171,6 +1204,7 @@ public class LocationComponentOptions implements Parcelable {
      * @param backgroundStaleName String icon or maki-icon name
      * @return this builder for chaining options together
      */
+    @NonNull
     public LocationComponentOptions.Builder backgroundStaleName(@Nullable String backgroundStaleName) {
       this.backgroundStaleName = backgroundStaleName;
       return this;
@@ -1183,6 +1217,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_foregroundDrawableStale
      */
+    @NonNull
     public LocationComponentOptions.Builder foregroundDrawableStale(int foregroundDrawableStale) {
       this.foregroundDrawableStale = foregroundDrawableStale;
       return this;
@@ -1200,6 +1235,7 @@ public class LocationComponentOptions implements Parcelable {
      * @param foregroundStaleName String icon or maki-icon name
      * @return this builder for chaining options together
      */
+    @NonNull
     public LocationComponentOptions.Builder foregroundStaleName(@Nullable String foregroundStaleName) {
       this.foregroundStaleName = foregroundStaleName;
       return this;
@@ -1212,6 +1248,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_gpsDrawable
      */
+    @NonNull
     public LocationComponentOptions.Builder gpsDrawable(int gpsDrawable) {
       this.gpsDrawable = gpsDrawable;
       return this;
@@ -1229,6 +1266,7 @@ public class LocationComponentOptions implements Parcelable {
      * @param gpsName String icon or maki-icon name
      * @return this builder for chaining options together
      */
+    @NonNull
     public LocationComponentOptions.Builder gpsName(@Nullable String gpsName) {
       this.gpsName = gpsName;
       return this;
@@ -1241,6 +1279,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_foregroundDrawable
      */
+    @NonNull
     public LocationComponentOptions.Builder foregroundDrawable(int foregroundDrawable) {
       this.foregroundDrawable = foregroundDrawable;
       return this;
@@ -1258,6 +1297,7 @@ public class LocationComponentOptions implements Parcelable {
      * @param foregroundName String icon or maki-icon name
      * @return this builder for chaining options together
      */
+    @NonNull
     public LocationComponentOptions.Builder foregroundName(@Nullable String foregroundName) {
       this.foregroundName = foregroundName;
       return this;
@@ -1270,6 +1310,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_backgroundDrawable
      */
+    @NonNull
     public LocationComponentOptions.Builder backgroundDrawable(int backgroundDrawable) {
       this.backgroundDrawable = backgroundDrawable;
       return this;
@@ -1287,6 +1328,7 @@ public class LocationComponentOptions implements Parcelable {
      * @param backgroundName String icon or maki-icon name
      * @return this builder for chaining options together
      */
+    @NonNull
     public LocationComponentOptions.Builder backgroundName(@Nullable String backgroundName) {
       this.backgroundName = backgroundName;
       return this;
@@ -1299,6 +1341,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_bearingDrawable
      */
+    @NonNull
     public LocationComponentOptions.Builder bearingDrawable(int bearingDrawable) {
       this.bearingDrawable = bearingDrawable;
       return this;
@@ -1316,6 +1359,7 @@ public class LocationComponentOptions implements Parcelable {
      * @param bearingName String icon or maki-icon name
      * @return this builder for chaining options together
      */
+    @NonNull
     public LocationComponentOptions.Builder bearingName(@Nullable String bearingName) {
       this.bearingName = bearingName;
       return this;
@@ -1328,6 +1372,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_bearingTintColor
      */
+    @NonNull
     public LocationComponentOptions.Builder bearingTintColor(@Nullable Integer bearingTintColor) {
       this.bearingTintColor = bearingTintColor;
       return this;
@@ -1340,6 +1385,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_foregroundTintColor
      */
+    @NonNull
     public LocationComponentOptions.Builder foregroundTintColor(@Nullable Integer foregroundTintColor) {
       this.foregroundTintColor = foregroundTintColor;
       return this;
@@ -1352,6 +1398,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_backgroundTintColor
      */
+    @NonNull
     public LocationComponentOptions.Builder backgroundTintColor(@Nullable Integer backgroundTintColor) {
       this.backgroundTintColor = backgroundTintColor;
       return this;
@@ -1364,6 +1411,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_foregroundStaleTintColor
      */
+    @NonNull
     public LocationComponentOptions.Builder foregroundStaleTintColor(@Nullable Integer foregroundStaleTintColor) {
       this.foregroundStaleTintColor = foregroundStaleTintColor;
       return this;
@@ -1376,6 +1424,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_backgroundStaleTintColor
      */
+    @NonNull
     public LocationComponentOptions.Builder backgroundStaleTintColor(@Nullable Integer backgroundStaleTintColor) {
       this.backgroundStaleTintColor = backgroundStaleTintColor;
       return this;
@@ -1388,6 +1437,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_elevation
      */
+    @NonNull
     public LocationComponentOptions.Builder elevation(float elevation) {
       this.elevation = elevation;
       return this;
@@ -1401,6 +1451,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_enableStaleState
      */
+    @NonNull
     public LocationComponentOptions.Builder enableStaleState(boolean enabled) {
       this.enableStaleState = enabled;
       return this;
@@ -1416,6 +1467,7 @@ public class LocationComponentOptions implements Parcelable {
      * @return this builder for chaining options together
      * @attr ref R.styleable#LocationComponent_staleStateTimeout
      */
+    @NonNull
     public LocationComponentOptions.Builder staleStateTimeout(long timeout) {
       this.staleStateTimeout = timeout;
       return this;
@@ -1435,7 +1487,8 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param padding The margins for the map in pixels (left, top, right, bottom).
      */
-    public LocationComponentOptions.Builder padding(int[] padding) {
+    @NonNull
+    public LocationComponentOptions.Builder padding(@Nullable int[] padding) {
       if (padding == null) {
         throw new NullPointerException("Null padding");
       }
@@ -1450,6 +1503,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param maxZoom The new maximum zoom level.
      */
+    @NonNull
     public LocationComponentOptions.Builder maxZoom(double maxZoom) {
       this.maxZoom = maxZoom;
       return this;
@@ -1460,6 +1514,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param minZoom The new minimum zoom level.
      */
+    @NonNull
     public LocationComponentOptions.Builder minZoom(double minZoom) {
       this.minZoom = minZoom;
       return this;
@@ -1474,6 +1529,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param maxZoomIconScale icon scale factor
      */
+    @NonNull
     public LocationComponentOptions.Builder maxZoomIconScale(float maxZoomIconScale) {
       this.maxZoomIconScale = maxZoomIconScale;
       return this;
@@ -1488,6 +1544,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param minZoomIconScale icon scale factor
      */
+    @NonNull
     public LocationComponentOptions.Builder minZoomIconScale(float minZoomIconScale) {
       this.minZoomIconScale = minZoomIconScale;
       return this;
@@ -1507,6 +1564,7 @@ public class LocationComponentOptions implements Parcelable {
      * @see Builder#trackingInitialMoveThreshold(float)
      * @see Builder#trackingMultiFingerMoveThreshold(float)
      */
+    @NonNull
     public LocationComponentOptions.Builder trackingGesturesManagement(boolean trackingGesturesManagement) {
       this.trackingGesturesManagement = trackingGesturesManagement;
       return this;
@@ -1517,6 +1575,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param moveThreshold the minimum movement
      */
+    @NonNull
     public LocationComponentOptions.Builder trackingInitialMoveThreshold(float moveThreshold) {
       this.trackingInitialMoveThreshold = moveThreshold;
       return this;
@@ -1528,6 +1587,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param moveThreshold the minimum movement
      */
+    @NonNull
     public LocationComponentOptions.Builder trackingMultiFingerMoveThreshold(float moveThreshold) {
       this.trackingMultiFingerMoveThreshold = moveThreshold;
       return this;
@@ -1538,6 +1598,7 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param layerBelow the id to set the location component below to.
      */
+    @NonNull
     public LocationComponentOptions.Builder layerBelow(String layerBelow) {
       this.layerBelow = layerBelow;
       return this;
@@ -1548,12 +1609,14 @@ public class LocationComponentOptions implements Parcelable {
      *
      * @param trackingAnimationDurationMultiplier the tracking animation duration multiplier
      */
+    @NonNull
     public LocationComponentOptions.Builder trackingAnimationDurationMultiplier(
       float trackingAnimationDurationMultiplier) {
       this.trackingAnimationDurationMultiplier = trackingAnimationDurationMultiplier;
       return this;
     }
 
+    @Nullable
     LocationComponentOptions autoBuild() {
       String missing = "";
       if (this.accuracyAlpha == null) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
index da3144eea1..88a29b3927 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
@@ -73,7 +73,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
 
   LocationLayerController(MapboxMap mapboxMap, LayerSourceProvider layerSourceProvider,
                           LayerFeatureProvider featureProvider, LayerBitmapProvider bitmapProvider,
-                          LocationComponentOptions options) {
+                          @NonNull LocationComponentOptions options) {
     this.mapboxMap = mapboxMap;
     this.layerSourceProvider = layerSourceProvider;
     this.bitmapProvider = bitmapProvider;
@@ -192,7 +192,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     return isHidden;
   }
 
-  private void setLayerVisibility(String layerId, boolean visible) {
+  private void setLayerVisibility(@NonNull String layerId, boolean visible) {
     Layer layer = mapboxMap.getLayer(layerId);
     if (layer != null) {
       String targetVisibility = visible ? VISIBLE : NONE;
@@ -202,7 +202,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     }
   }
 
-  private void addLayers(String idBelowLayer) {
+  private void addLayers(@NonNull String idBelowLayer) {
     addSymbolLayer(BEARING_LAYER, idBelowLayer);
     addSymbolLayer(FOREGROUND_LAYER, BEARING_LAYER);
     addSymbolLayer(BACKGROUND_LAYER, FOREGROUND_LAYER);
@@ -210,7 +210,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     addAccuracyLayer();
   }
 
-  private void addSymbolLayer(String layerId, String beforeLayerId) {
+  private void addSymbolLayer(@NonNull String layerId, @NonNull String beforeLayerId) {
     Layer layer = layerSourceProvider.generateLayer(layerId);
     addLayerToMap(layer, beforeLayerId);
   }
@@ -220,12 +220,12 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     addLayerToMap(accuracyLayer, BACKGROUND_LAYER);
   }
 
-  private void addLayerToMap(Layer layer, @NonNull String idBelowLayer) {
+  private void addLayerToMap(@NonNull Layer layer, @NonNull String idBelowLayer) {
     mapboxMap.addLayerBelow(layer, idBelowLayer);
     layerMap.add(layer.getId());
   }
 
-  private void setBearingProperty(String propertyId, float bearing) {
+  private void setBearingProperty(@NonNull String propertyId, float bearing) {
     locationFeature.addNumberProperty(propertyId, bearing);
     refreshSource();
   }
@@ -276,7 +276,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     mapboxMap.addImage(BACKGROUND_STALE_ICON, backgroundStaleBitmap);
   }
 
-  private void styleShadow(LocationComponentOptions options) {
+  private void styleShadow(@NonNull LocationComponentOptions options) {
     mapboxMap.addImage(SHADOW_ICON, bitmapProvider.generateShadowBitmap(options));
   }
 
@@ -310,7 +310,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     mapboxMap.addImage(FOREGROUND_STALE_ICON, foregroundBitmapStale);
   }
 
-  private void styleScaling(LocationComponentOptions options) {
+  private void styleScaling(@NonNull LocationComponentOptions options) {
     for (String layerId : layerMap) {
       Layer layer = mapboxMap.getLayer(layerId);
       if (layer != null && layer instanceof SymbolLayer) {
@@ -342,6 +342,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     refreshSource();
   }
 
+  @Nullable
   private String buildIconString(@Nullable String bitmapName, @NonNull String drawableName) {
     if (bitmapName != null) {
       return bitmapName;
@@ -361,7 +362,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
   // Map click event
   //
 
-  boolean onMapClick(LatLng point) {
+  boolean onMapClick(@NonNull LatLng point) {
     PointF screenLoc = mapboxMap.getProjection().toScreenLocation(point);
     List<Feature> features = mapboxMap.queryRenderedFeatures(screenLoc,
       BACKGROUND_LAYER,
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java
index 89d27a38fa..b4f9051af8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java
@@ -10,6 +10,7 @@ import java.util.List;
 
 abstract class MapboxCameraAnimatorAdapter extends
   MapboxFloatAnimator<MapboxAnimator.OnCameraAnimationsValuesChangeListener> {
+  @Nullable
   private final MapboxMap.CancelableCallback cancelableCallback;
 
   MapboxCameraAnimatorAdapter(Float previous, Float target,
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java
index 4a6d8c3b73..d12e80a69d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.location;
 
 import android.animation.FloatEvaluator;
 import android.animation.TypeEvaluator;
+import android.support.annotation.NonNull;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ abstract class MapboxFloatAnimator<L> extends MapboxAnimator<Float, L> {
     super(previous, target, updateListeners);
   }
 
+  @NonNull
   @Override
   TypeEvaluator provideEvaluator() {
     return new FloatEvaluator();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java
index b2f1b61a2d..f2c5f9a239 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.location;
 
 import android.animation.TypeEvaluator;
 
+import android.support.annotation.NonNull;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
 import java.util.List;
@@ -12,6 +13,7 @@ abstract class MapboxLatLngAnimator<L> extends MapboxAnimator<LatLng, L> {
     super(previous, target, updateListeners);
   }
 
+  @NonNull
   @Override
   TypeEvaluator provideEvaluator() {
     return new LatLngEvaluator();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java
index c8f6ed58b9..c7447796e0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.os.Handler;
+import android.support.annotation.NonNull;
 
 /**
  * Class controls the location stale state when the {@link android.location.Location} hasn't
@@ -12,6 +13,7 @@ class StaleStateManager {
 
   private boolean isEnabled;
   private final OnLocationStaleListener innerOnLocationStaleListeners;
+  @NonNull
   private final Handler handler;
   private boolean isStale = true;
   private long delayTime;
@@ -23,6 +25,7 @@ class StaleStateManager {
     delayTime = options.staleStateTimeout();
   }
 
+  @NonNull
   private Runnable staleStateRunnable = new Runnable() {
     @Override
     public void run() {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java
index 8ff0f97a70..640ce0a678 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,7 +20,7 @@ class TiltAnimator extends MapboxCameraAnimatorAdapter {
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnCameraAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewTiltValue((Float) animation.getAnimatedValue());
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java
index 553678709e..8907b93b5f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java
@@ -65,8 +65,9 @@ public final class Utils {
     return bitmap;
   }
 
+  @Nullable
   static Drawable getDrawable(@NonNull Context context, @DrawableRes int drawableRes,
-                              @ColorInt Integer tintColor) {
+                              @Nullable @ColorInt Integer tintColor) {
     Drawable drawable = ContextCompat.getDrawable(context, drawableRes);
     if (tintColor == null) {
       return drawable;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java
index 323b51fa88..e37dfc1113 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.location;
 
 import android.animation.ValueAnimator;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -20,7 +21,7 @@ class ZoomAnimator extends MapboxCameraAnimatorAdapter {
   }
 
   @Override
-  public void onAnimationUpdate(ValueAnimator animation) {
+  public void onAnimationUpdate(@NonNull ValueAnimator animation) {
     for (OnCameraAnimationsValuesChangeListener listener : updateListeners) {
       listener.onNewZoomValue((Float) animation.getAnimatedValue());
     }