1 files changed, 15 insertions, 2 deletions

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 af48b5c4d4..d8ebf1b510 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
@@ -75,9 +75,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;
 
@@ -90,6 +93,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;
 
@@ -339,7 +343,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);
@@ -831,7 +835,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) {
@@ -902,6 +906,7 @@ public final class LocationComponent {
     locationAnimatorCoordinator.feedNewAccuracyRadius(Utils.calculateZoomLevelRadius(mapboxMap, location), noAnimation);
   }
 
+  @NonNull
   private OnCameraMoveListener onCameraMoveListener = new OnCameraMoveListener() {
     @Override
     public void onCameraMove() {
@@ -909,6 +914,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnCameraIdleListener onCameraIdleListener = new OnCameraIdleListener() {
     @Override
     public void onCameraIdle() {
@@ -916,6 +922,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnMapClickListener onMapClickListener = new OnMapClickListener() {
     @Override
     public void onMapClick(@NonNull LatLng point) {
@@ -927,6 +934,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private MapboxMap.OnMapLongClickListener onMapLongClickListener = new MapboxMap.OnMapLongClickListener() {
     @Override
     public void onMapLongClick(@NonNull LatLng point) {
@@ -938,6 +946,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnLocationStaleListener onLocationStaleListener = new OnLocationStaleListener() {
     @Override
     public void onStaleStateChange(boolean isStale) {
@@ -949,6 +958,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnCameraMoveInvalidateListener onCameraMoveInvalidateListener = new OnCameraMoveInvalidateListener() {
     @Override
     public void onInvalidateCameraMove() {
@@ -956,6 +966,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private CompassListener compassListener = new CompassListener() {
     @Override
     public void onCompassChanged(float userHeading) {
@@ -968,6 +979,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private LocationEngineListener locationEngineListener = new LocationEngineListener() {
     @Override
     @SuppressWarnings( {"MissingPermission"})
@@ -983,6 +995,7 @@ public final class LocationComponent {
     }
   };
 
+  @NonNull
   private OnCameraTrackingChangedListener cameraTrackingChangedListener = new OnCameraTrackingChangedListener() {
     @Override
     public void onCameraTrackingDismissed() {