From e3f1d8e3a0beb648ec90ac4d9baa5f27c6cf3935 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Wed, 22 Nov 2017 18:46:31 +0100
Subject: [android] - harden MarkerView integration by checking for null bitmap
 (#10532)

---
 .../src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java
index 2ee17c227d..8749656e35 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java
@@ -36,7 +36,7 @@ public class Icon {
    * @return The bitmap being used for the icon.
    */
   public Bitmap getBitmap() {
-    if (mBitmap.getConfig() != Bitmap.Config.ARGB_8888) {
+    if (mBitmap != null && mBitmap.getConfig() != Bitmap.Config.ARGB_8888) {
       mBitmap = mBitmap.copy(Bitmap.Config.ARGB_8888, false);
     }
     return mBitmap;
-- 
cgit v1.2.1