From e3c79bfd34152bd3837fb3fdee764c15b13f1691 Mon Sep 17 00:00:00 2001 From: Josh Burton Date: Wed, 12 Oct 2016 02:07:47 +1300 Subject: [android] - Use correct nullity annotation for convertView (#6521) --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.1