diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-11-22 18:46:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 18:46:31 +0100 |
| commit | e3f1d8e3a0beb648ec90ac4d9baa5f27c6cf3935 (patch) | |
| tree | a5eca1f4d0852b882c1620f241df90476def5fe5 | |
| parent | 59a8fd2ff85a2ee627a191a5bf327effacdd6e22 (diff) | |
| download | qtlocation-mapboxgl-e3f1d8e3a0beb648ec90ac4d9baa5f27c6cf3935.tar.gz | |
[android] - harden MarkerView integration by checking for null bitmap (#10532)
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java | 2 |
1 files changed, 1 insertions, 1 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 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; |