[android] - harden MarkerView integration by checking for null bitmap (#10532)

2017-11-22 18:46:31 +01:00
parent 7b7b2c53fb
commit f64475f76c
1 changed files with 1 additions and 1 deletions
--- 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;