1 files changed, 9 insertions, 8 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
index 80ffa973e7..7aca93fe2e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.maps;
 
 import android.graphics.Bitmap;
 
+import android.support.annotation.NonNull;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
@@ -37,7 +38,7 @@ class IconManager {
     loadIcon(IconFactory.recreate(IconFactory.ICON_MARKERVIEW_ID, IconFactory.ICON_MARKERVIEW_BITMAP));
   }
 
-  Icon loadIconForMarker(Marker marker) {
+  Icon loadIconForMarker(@NonNull Marker marker) {
     Icon icon = marker.getIcon();
     if (icon == null) {
       // TODO replace with anchor implementation, we are faking an anchor by adding extra pixels and diving height by 2
@@ -50,14 +51,14 @@ class IconManager {
     return icon;
   }
 
-  void loadIconForMarkerView(MarkerView marker) {
+  void loadIconForMarkerView(@NonNull MarkerView marker) {
     Icon icon = marker.getIcon();
     Bitmap bitmap = icon.getBitmap();
     updateHighestIconSize(bitmap);
     addIcon(icon, false);
   }
 
-  int getTopOffsetPixelsForIcon(Icon icon) {
+  int getTopOffsetPixelsForIcon(@NonNull Icon icon) {
     return (int) (nativeMapView.getTopOffsetPixelsForAnnotationSymbol(icon.getId()) * nativeMapView.getPixelRatio());
   }
 
@@ -77,11 +78,11 @@ class IconManager {
     return icon;
   }
 
-  private void addIcon(Icon icon) {
+  private void addIcon(@NonNull Icon icon) {
     addIcon(icon, true);
   }
 
-  private void addIcon(Icon icon, boolean addIconToMap) {
+  private void addIcon(@NonNull Icon icon, boolean addIconToMap) {
     if (!iconMap.keySet().contains(icon)) {
       iconMap.put(icon, 1);
       if (addIconToMap) {
@@ -125,7 +126,7 @@ class IconManager {
     }
   }
 
-  void ensureIconLoaded(Marker marker, MapboxMap mapboxMap) {
+  void ensureIconLoaded(@NonNull Marker marker, @NonNull MapboxMap mapboxMap) {
     Icon icon = marker.getIcon();
     if (icon == null) {
       icon = loadDefaultIconForMarker(marker);
@@ -134,7 +135,7 @@ class IconManager {
     setTopOffsetPixels(marker, mapboxMap, icon);
   }
 
-  private void setTopOffsetPixels(Marker marker, MapboxMap mapboxMap, Icon icon) {
+  private void setTopOffsetPixels(Marker marker, @NonNull MapboxMap mapboxMap, @NonNull Icon icon) {
     // this seems to be a costly operation according to the profiler so I'm trying to save some calls
     Marker previousMarker = marker.getId() != -1 ? (Marker) mapboxMap.getAnnotation(marker.getId()) : null;
     if (previousMarker == null || previousMarker.getIcon() == null || previousMarker.getIcon() != marker.getIcon()) {
@@ -142,7 +143,7 @@ class IconManager {
     }
   }
 
-  void iconCleanup(Icon icon) {
+  void iconCleanup(@NonNull Icon icon) {
     Integer refCounter = iconMap.get(icon);
     if (refCounter != null) {
       refCounter--;