diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
index 10a408c578..d8743a0a2c 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
@@ -33,6 +33,7 @@ import java.io.IOException;
  */
 public final class ContentDataSourceTest extends InstrumentationTestCase {
 
+  private static final String AUTHORITY = "com.google.android.exoplayer2.core.test";
   private static final String DATA_PATH = "binary/1024_incrementing_bytes.mp3";
   private static final long DATA_LENGTH = 1024;
 
@@ -40,7 +41,7 @@ public final class ContentDataSourceTest extends InstrumentationTestCase {
     ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
     Uri contentUri = new Uri.Builder()
         .scheme(ContentResolver.SCHEME_CONTENT)
-        .authority(TestContentProvider.AUTHORITY)
+        .authority(AUTHORITY)
         .path(DATA_PATH).build();
     DataSpec dataSpec = new DataSpec(contentUri);
     try {
@@ -57,7 +58,7 @@ public final class ContentDataSourceTest extends InstrumentationTestCase {
     ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
     Uri contentUri = new Uri.Builder()
         .scheme(ContentResolver.SCHEME_CONTENT)
-        .authority(TestContentProvider.AUTHORITY)
+        .authority(AUTHORITY)
         .build();
     DataSpec dataSpec = new DataSpec(contentUri);
     try {
@@ -70,10 +71,11 @@ public final class ContentDataSourceTest extends InstrumentationTestCase {
     }
   }
 
+  /**
+   * A {@link ContentProvider} for the test.
+   */
   public static final class TestContentProvider extends ContentProvider {
 
-    private static final String AUTHORITY = "com.google.android.exoplayer2.core.test";
-
     @Override
     public boolean onCreate() {
       return true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
index 507162519a..d118b91378 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
@@ -91,9 +91,9 @@ public final class ContentDataSource implements DataSource {
           // The asset must extend to the end of the file.
           bytesRemaining = inputStream.available();
           if (bytesRemaining == 0) {
-            // FileInputStream.available() returns 0 if the remaining length cannot be determined, or
-            // if it's greater than Integer.MAX_VALUE. We don't know the true length in either case,
-            // so treat as unbounded.
+            // FileInputStream.available() returns 0 if the remaining length cannot be determined,
+            // or if it's greater than Integer.MAX_VALUE. We don't know the true length in either
+            // case, so treat as unbounded.
             bytesRemaining = C.LENGTH_UNSET;
           }
         }