Merge heads

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendToGoogleUtils.java

@@ -19,6 +19,7 @@ package com.google.android.apps.mytracks.io.sendtogoogle;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.LocationUtils;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.location.Location;
 import android.util.Log;
@@ -109,11 +110,12 @@ public class SendToGoogleUtils {
    * @param segment the track segment
    * @param splitTracks an array of track segments
    */
-  private static void prepareTrackSegment(Track segment, ArrayList<Track> splitTracks) {
+  @VisibleForTesting
+  static boolean prepareTrackSegment(Track segment, ArrayList<Track> splitTracks) {
     // Make sure the segment has at least 2 points
     if (segment.getLocations().size() < 2) {
       Log.d(TAG, "segment has less than 2 points");
-      return;
+      return false;
     }
 
     // For a new segment, sets it stop time
@@ -128,5 +130,6 @@ public class SendToGoogleUtils {
     LocationUtils.decimate(segment, 2.0);
 
     splitTracks.add(segment);
+    return true;
   }
 }