summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-01-24 17:22:51 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2019-01-24 17:22:51 +0100
commit12d6da715b1a49b00206aa85b735a853cf6ce76e (patch)
tree2d8968e06ef6798a8e29c85b6a96a02b1351c051
parent6227d2853302170433bd44e802afb02ef1914499 (diff)
downloadqtlocation-mapboxgl-upstream/lp-13790-location-engine-annotation.tar.gz
[android] fix LocationEngine's annotationupstream/lp-13790-location-engine-annotation
It's always safe to pass a null engine.
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
index 1324993e5b..92b4288c3b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
@@ -337,7 +337,7 @@ public final class LocationComponent {
*/
@RequiresPermission(anyOf = {ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION})
public void activateLocationComponent(@NonNull Context context, @NonNull Style style,
- @NonNull LocationEngine locationEngine) {
+ @Nullable LocationEngine locationEngine) {
activateLocationComponent(context, style, locationEngine, R.style.mapbox_LocationComponent);
}
@@ -351,7 +351,7 @@ public final class LocationComponent {
*/
@RequiresPermission(anyOf = {ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION})
public void activateLocationComponent(@NonNull Context context, @NonNull Style style,
- @NonNull LocationEngine locationEngine,
+ @Nullable LocationEngine locationEngine,
@NonNull LocationEngineRequest locationEngineRequest) {
activateLocationComponent(context, style, locationEngine, locationEngineRequest, R.style.mapbox_LocationComponent);
}