summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-02-28 09:18:49 -0500
committerGitHub <noreply@github.com>2017-02-28 09:18:49 -0500
commit809d8248b34815745cde8c4ddcdb2590912330f1 (patch)
tree2940ea081e6225d93ef5df923b7cf62bb72e144e /platform
parent9ca9adf69c4ad1d946af611c3d08800e0e301fb8 (diff)
downloadqtlocation-mapboxgl-809d8248b34815745cde8c4ddcdb2590912330f1.tar.gz
Fix a NPE that occurs when MapView is initialized with a null MapboxMapOptions (#8131)
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 658889761a..1a50b96bd1 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -106,7 +106,7 @@ public class MapView extends FrameLayout {
@UiThread
public MapView(@NonNull Context context, @Nullable MapboxMapOptions options) {
super(context);
- initialise(context, options);
+ initialise(context, options == null ? MapboxMapOptions.createFromAttributes(context, null) : options);
}
private void initialise(@NonNull final Context context, @NonNull final MapboxMapOptions options) {