diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-11-22 16:09:23 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2017-11-22 16:09:23 +0100 |
| commit | 2e67ca84b8241dfde12d6271329bb8299bd37b79 (patch) | |
| tree | 5c88cdf3b7267b77eca49f698bfe92e4f69a0427 | |
| parent | dda87bbecd44a16ddc5b4dcb7e4bbf670376b39f (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-bitmap-zero.tar.gz | |
[android] - harden MarkerView integration by checking for null bitmapupstream/tvn-bitmap-zero
| -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; |