diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-11-22 18:46:31 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2017-12-06 12:37:48 +0100 |
| commit | f64475f76c9809385a480d646b2212757889125f (patch) | |
| tree | 2eb182509f4de595c987ea89b102a7a1349cf304 | |
| parent | 7b7b2c53fb1501becefa7da5afdb810f531db2d1 (diff) | |
| download | qtlocation-mapboxgl-f64475f76c9809385a480d646b2212757889125f.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; |