summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Burton <athor3d@gmail.com>2016-10-12 02:07:47 +1300
committerTobrun <tobrun.van.nuland@gmail.com>2016-10-11 15:07:47 +0200
commite3c79bfd34152bd3837fb3fdee764c15b13f1691 (patch)
treeedb6b171d9f9005d8731becf59a1bb89b442a416
parent7dbc302b2f048902124e8f3d9d368c14204cfae5 (diff)
downloadqtlocation-mapboxgl-e3c79bfd34152bd3837fb3fdee764c15b13f1691.tar.gz
[android] - Use correct nullity annotation for convertView (#6521)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 5192068954..ea4bb4eafa 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -2036,7 +2036,7 @@ public class MapboxMap {
* @return the View that is adapted to the contents of MarkerView
*/
@Nullable
- public abstract View getView(@NonNull U marker, @NonNull View convertView, @NonNull ViewGroup parent);
+ public abstract View getView(@NonNull U marker, @Nullable View convertView, @NonNull ViewGroup parent);
/**
* Called when an MarkerView is removed from the MapView or the View object is going to be reused.