[android] - Marker test coverage

1 files changed, 9 insertions, 3 deletions

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 e30b81d4c9..fceeb52713 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
@@ -6,9 +6,10 @@ import com.mapbox.mapboxsdk.maps.MapView;
 
 /**
  * Icon is the visual representation of a {@link Marker} on a {@link MapView}.
+ *
  * @see Marker
  */
-public final class Icon {
+public class Icon {
     private Bitmap mBitmap;
     private String mId;
 
@@ -39,8 +40,13 @@ public final class Icon {
 
     @Override
     public int hashCode() {
-        int result = mBitmap.hashCode();
-        result = 31 * result + mId.hashCode();
+        int result = 0;
+        if (mBitmap != null) {
+            result = mBitmap.hashCode();
+        }
+        if (mId != null) {
+            result = 31 * result + mId.hashCode();
+        }
         return result;
     }
 }