Lint cleanup.

myTracks/src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java

@@ -83,9 +83,8 @@ public class TrackStubUtils {
     loc.setTime(INITIAL_TIME);
     loc.setBearing(INITIAL_BEARING);
     SensorDataSet sd = SensorDataSet.newBuilder().build();
-    MyTracksLocation myTracksLocation = new MyTracksLocation(loc, sd);
 
-    return myTracksLocation;
+    return new MyTracksLocation(loc, sd);
   }
 
 }

myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java

@@ -210,7 +210,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     // Id
     AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
     // Name
-    String name = NAME_PREFIX + Long.toString(trackId);
+    String name = NAME_PREFIX + trackId;
     AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
     AndroidMock.replay(cursorMock);
     Track track = providerUtils.createTrack(cursorMock);
@@ -416,7 +416,7 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
     // Id
     AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(id);
     // Name
-    String name = NAME_PREFIX + Long.toString(id);
+    String name = NAME_PREFIX + id;
     AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
     // trackIdIndex
     long trackId = 11L;

myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriterTest.java

@@ -153,12 +153,12 @@ public abstract class TrackWriterTest extends AndroidTestCase {
     assertTrue(length > 0);
 
     // The children may be a sucession of text elements, just concatenate them
-    String result = "";
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i < length; i++) {
       Text textNode = (Text) children.item(i);
-      result += textNode.getNodeValue();
+      result.append(textNode.getNodeValue());
     }
-    return result;
+    return result.toString();
   }
 
   /**
@@ -212,8 +212,7 @@ public abstract class TrackWriterTest extends AndroidTestCase {
     builderFactory.setIgnoringComments(true);
     builderFactory.setIgnoringElementContentWhitespace(true);
     DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();
-    Document doc = documentBuilder.parse(
-        new InputSource(new StringReader(contents)));
-    return doc;
+
+    return documentBuilder.parse(new InputSource(new StringReader(contents)));
   }
 }

myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -164,26 +164,25 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
         @Override
       public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
           String sortOrder) {
-        MockCursor mockCursor = new MockCursor() {
-            @Override
-          public int getCount() {
-            return 1;
-          }
+          return new MockCursor() {
+              @Override
+            public int getCount() {
+              return 1;
+            }
 
-            @Override
-          public boolean moveToNext() {
-            return true;
-          }
+              @Override
+            public boolean moveToNext() {
+              return true;
+            }
 
-            @Override
-          public String getString(int columnIndex) {
-            return String.valueOf(GoogleLocationUtils.USE_LOCATION_FOR_SERVICES_ON);
-          }
+              @Override
+            public String getString(int columnIndex) {
+              return String.valueOf(GoogleLocationUtils.USE_LOCATION_FOR_SERVICES_ON);
+            }
 
-            @Override
-          public void close() {}
-        };
-        return mockCursor;
+              @Override
+            public void close() {}
+          };
       }
     };
     mockContentResolver.addProvider("com.google.settings", googleSettingsProvider);

myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java

@@ -165,7 +165,7 @@ public class StringUtilsTest extends AndroidTestCase {
    * Tests {@link StringUtils#getTimeParts(long)} with a positive number.
    */
   public void testGetTimeParts_postive() {
-    int parts[] = StringUtils.getTimeParts(61000);
+      int[] parts = StringUtils.getTimeParts(61000);
     assertEquals(1, parts[0]);
     assertEquals(1, parts[1]);
     assertEquals(0, parts[2]);
@@ -175,7 +175,7 @@ public class StringUtilsTest extends AndroidTestCase {
    * Tests {@link StringUtils#getTimeParts(long)} with a negative number.
    */
   public void testGetTimeParts_negative() {
-    int parts[] = StringUtils.getTimeParts(-61000);
+      int[] parts = StringUtils.getTimeParts(-61000);
     assertEquals(-1, parts[0]);
     assertEquals(-1, parts[1]);
     assertEquals(0, parts[2]);