1 files changed, 6 insertions, 19 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java
index b9a358c0f9..845a6bb539 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/PolylineContainer.java
@@ -50,25 +50,12 @@ class PolylineContainer implements Polylines {
         }
       }
 
-      long[] ids = null;
-      if (nativeMapView != null) {
-        ids = nativeMapView.addPolylines(polylines);
-      }
-
-      long id = 0;
-      Polyline p;
-
-      for (int i = 0; i < polylines.size(); i++) {
-        p = polylines.get(i);
-        p.setMapboxMap(mapboxMap);
-        if (ids != null) {
-          id = ids[i];
-        } else {
-          // unit test
-          id++;
-        }
-        p.setId(id);
-        annotations.put(id, p);
+      long[] ids = nativeMapView.addPolylines(polylines);
+      for (int i = 0; i < ids.length; i++) {
+        Polyline polylineCreated = polylines.get(i);
+        polylineCreated.setMapboxMap(mapboxMap);
+        polylineCreated.setId(ids[i]);
+        annotations.put(ids[i], polylineCreated);
       }
     }
     return polylines;