1 files changed, 9 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java
index af207204d9..434244a7c1 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java
@@ -23,11 +23,15 @@ class InfoWindowManager {
 
   private final List<InfoWindow> infoWindows = new ArrayList<>();
 
+  @Nullable
   private MapboxMap.InfoWindowAdapter infoWindowAdapter;
   private boolean allowConcurrentMultipleInfoWindows;
 
+  @Nullable
   private MapboxMap.OnInfoWindowClickListener onInfoWindowClickListener;
+  @Nullable
   private MapboxMap.OnInfoWindowLongClickListener onInfoWindowLongClickListener;
+  @Nullable
   private MapboxMap.OnInfoWindowCloseListener onInfoWindowCloseListener;
 
   void update() {
@@ -42,6 +46,7 @@ class InfoWindowManager {
     this.infoWindowAdapter = infoWindowAdapter;
   }
 
+  @Nullable
   MapboxMap.InfoWindowAdapter getInfoWindowAdapter() {
     return infoWindowAdapter;
   }
@@ -54,7 +59,7 @@ class InfoWindowManager {
     return allowConcurrentMultipleInfoWindows;
   }
 
-  boolean isInfoWindowValidForMarker(Marker marker) {
+  boolean isInfoWindowValidForMarker(@Nullable Marker marker) {
     return marker != null && (!TextUtils.isEmpty(marker.getTitle()) || !TextUtils.isEmpty(marker.getSnippet()));
   }
 
@@ -62,6 +67,7 @@ class InfoWindowManager {
     onInfoWindowClickListener = listener;
   }
 
+  @Nullable
   MapboxMap.OnInfoWindowClickListener getOnInfoWindowClickListener() {
     return onInfoWindowClickListener;
   }
@@ -70,6 +76,7 @@ class InfoWindowManager {
     onInfoWindowLongClickListener = listener;
   }
 
+  @Nullable
   MapboxMap.OnInfoWindowLongClickListener getOnInfoWindowLongClickListener() {
     return onInfoWindowLongClickListener;
   }
@@ -78,6 +85,7 @@ class InfoWindowManager {
     onInfoWindowCloseListener = listener;
   }
 
+  @Nullable
   MapboxMap.OnInfoWindowCloseListener getOnInfoWindowCloseListener() {
     return onInfoWindowCloseListener;
   }