From 199c0cac2573d58483e52abac9e1c6621b0df603 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Fri, 10 Nov 2017 16:34:09 +0100
Subject: [PATCH] [android] - harden deselection mechanism for markers (#10403)

---
 .../com/mapbox/mapboxsdk/maps/AnnotationManager.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
index 9f256c341..64b33ad59 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -302,12 +302,14 @@ class AnnotationManager {
     }
 
     for (Marker marker : selectedMarkers) {
-      if (marker.isInfoWindowShown()) {
-        marker.hideInfoWindow();
-      }
+      if (marker != null) {
+        if (marker.isInfoWindowShown()) {
+          marker.hideInfoWindow();
+        }
 
-      if (marker instanceof MarkerView) {
-        markerViewManager.deselect((MarkerView) marker, false);
+        if (marker instanceof MarkerView) {
+          markerViewManager.deselect((MarkerView) marker, false);
+        }
       }
     }