From 580605e13251f6d1b2fdefcf5902bf7ee3264259 Mon Sep 17 00:00:00 2001
From: hashfunction <ahmed@ookla.com>
Date: Wed, 27 Dec 2017 12:21:21 -0800
Subject: [android] Fixes #10563 NPE addAnnotationIcon

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 49318e277a..fbf424e048 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -321,6 +321,10 @@ public class MapView extends FrameLayout {
           MapView.this.post(new Runnable() {
             @Override
             public void run() {
+              // There is no guarantee that onDestroy will not be called before the surface is created
+              if (destroyed) {
+                return;
+              }
               // Initialise only once
               if (mapboxMap == null) {
                 initialiseMap();
-- 
cgit v1.2.1