[android] - use default icon when compass icon fails to decodeupstream/tvn-compassview-decode

1 files changed, 6 insertions, 0 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
index e71d509fcf..c119d869b1 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
@@ -191,6 +191,12 @@ public final class UiSettings {
   }
 
   private Drawable decode(byte[] bitmap) {
+    if (bitmap == null) {
+      // return default icon
+      return compassView.getResources().getDrawable(R.drawable.mapbox_compass_icon);
+    }
+
+    // try decoding saved bitmap
     Bitmap compass = BitmapFactory.decodeByteArray(bitmap, 0, bitmap.length);
     return new BitmapDrawable(compassView.getResources(), compass);
   }