summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-11-28 10:36:46 +0100
committerGitHub <noreply@github.com>2016-11-28 10:36:46 +0100
commit644ca74906af9488ecd6008c59085133e46e2471 (patch)
tree71d28963a44dd9fee0c25b71b6eb8cbd50a91396 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
parente94b3d944bc977f52a0579303d4bd58980d1ef1e (diff)
downloadqtlocation-mapboxgl-644ca74906af9488ecd6008c59085133e46e2471.tar.gz
[android] - fix null pointer when no camera position is available on map initialisation (#7181)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java')
-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 15543628d2..a3e4c2b08f 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
@@ -259,7 +259,7 @@ public class MapView extends FrameLayout {
mapboxMap.setDebugActive(options.getDebugActive());
CameraPosition position = options.getCamera();
- if (!position.equals(CameraPosition.DEFAULT)) {
+ if (position != null && !position.equals(CameraPosition.DEFAULT)) {
mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(position));
myLocationView.setTilt(position.tilt);
}