[android] #5291 - Fixing merge conflicts

2016-06-09 14:35:10 -05:00
parent d67b88dba9
commit b90571107d
3 changed files with 4 additions and 23 deletions
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -371,9 +371,7 @@ final class NativeMapView {
    }

    public void updateMarker(Marker marker) {
-        LatLng position = marker.getPosition();
-        Icon icon = marker.getIcon();
-        nativeUpdateMarker(mNativeMapViewPtr, marker.getId(), position.getLatitude(), position.getLongitude(), icon.getId());
+        nativeUpdateMarker(mNativeMapViewPtr, marker);
    }

    public void removeAnnotation(long id) {