Change DataSource.Type to a boolean.

There are only two types at the moment and we can therefore use a boolean.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=203937357

extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java

@@ -241,7 +241,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
       Clock clock,
       Clock clock,
       RequestProperties defaultRequestProperties,
       RequestProperties defaultRequestProperties,
       boolean handleSetCookieRequests) {
       boolean handleSetCookieRequests) {
-    super(DataSource.TYPE_REMOTE);
+    super(/* isNetwork= */ true);
     this.urlRequestCallback = new UrlRequestCallback();
     this.urlRequestCallback = new UrlRequestCallback();
     this.cronetEngine = Assertions.checkNotNull(cronetEngine);
     this.cronetEngine = Assertions.checkNotNull(cronetEngine);
     this.executor = Assertions.checkNotNull(executor);
     this.executor = Assertions.checkNotNull(executor);

extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java

@@ -120,7 +120,7 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
       @Nullable TransferListener<? super DataSource> listener,
       @Nullable TransferListener<? super DataSource> listener,
       @Nullable CacheControl cacheControl,
       @Nullable CacheControl cacheControl,
       @Nullable RequestProperties defaultRequestProperties) {
       @Nullable RequestProperties defaultRequestProperties) {
-    super(DataSource.TYPE_REMOTE);
+    super(/* isNetwork= */ true);
     this.callFactory = Assertions.checkNotNull(callFactory);
     this.callFactory = Assertions.checkNotNull(callFactory);
     this.userAgent = userAgent;
     this.userAgent = userAgent;
     this.contentTypePredicate = contentTypePredicate;
     this.contentTypePredicate = contentTypePredicate;

extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java

@@ -43,7 +43,7 @@ public final class RtmpDataSource extends BaseDataSource {
 
 
   /** @param listener An optional listener. */
   /** @param listener An optional listener. */
   public RtmpDataSource(@Nullable TransferListener<? super DataSource> listener) {
   public RtmpDataSource(@Nullable TransferListener<? super DataSource> listener) {
-    super(DataSource.TYPE_REMOTE);
+    super(/* isNetwork= */ true);
     if (listener != null) {
     if (listener != null) {
       addTransferListener(listener);
       addTransferListener(listener);
     }
     }

library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java

@@ -57,7 +57,7 @@ public final class AssetDataSource extends BaseDataSource {
    * @param listener An optional listener.
    * @param listener An optional listener.
    */
    */
   public AssetDataSource(Context context, @Nullable TransferListener<? super DataSource> listener) {
   public AssetDataSource(Context context, @Nullable TransferListener<? super DataSource> listener) {
-    super(DataSource.TYPE_LOCAL);
+    super(/* isNetwork= */ false);
     this.assetManager = context.getAssets();
     this.assetManager = context.getAssets();
     if (listener != null) {
     if (listener != null) {
       addTransferListener(listener);
       addTransferListener(listener);

library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java

@@ -26,16 +26,16 @@ import java.util.ArrayList;
  */
  */
 public abstract class BaseDataSource implements DataSource {
 public abstract class BaseDataSource implements DataSource {
 
 
-  private final @DataSource.Type int type;
+  private final boolean isNetwork;
   private final ArrayList<TransferListener<? super DataSource>> listeners;
   private final ArrayList<TransferListener<? super DataSource>> listeners;
 
 
   /**
   /**
-   * Creates base data source for a data source of the specified type.
+   * Creates base data source.
    *
    *
-   * @param type The {@link DataSource.Type} of the data source.
+   * @param isNetwork Whether the data source loads data through a network.
    */
    */
-  protected BaseDataSource(@DataSource.Type int type) {
-    this.type = type;
+  protected BaseDataSource(boolean isNetwork) {
+    this.isNetwork = isNetwork;
     this.listeners = new ArrayList<>(/* initialCapacity= */ 1);
     this.listeners = new ArrayList<>(/* initialCapacity= */ 1);
   }
   }
 
 

library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java

@@ -35,7 +35,7 @@ public final class ByteArrayDataSource extends BaseDataSource {
    * @param data The data to be read.
    * @param data The data to be read.
    */
    */
   public ByteArrayDataSource(byte[] data) {
   public ByteArrayDataSource(byte[] data) {
-    super(DataSource.TYPE_LOCAL);
+    super(/* isNetwork= */ false);
     Assertions.checkNotNull(data);
     Assertions.checkNotNull(data);
     Assertions.checkArgument(data.length > 0);
     Assertions.checkArgument(data.length > 0);
     this.data = data;
     this.data = data;

library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java

@@ -62,7 +62,7 @@ public final class ContentDataSource extends BaseDataSource {
    */
    */
   public ContentDataSource(
   public ContentDataSource(
       Context context, @Nullable TransferListener<? super DataSource> listener) {
       Context context, @Nullable TransferListener<? super DataSource> listener) {
-    super(DataSource.TYPE_LOCAL);
+    super(/* isNetwork= */ false);
     this.resolver = context.getContentResolver();
     this.resolver = context.getContentResolver();
     if (listener != null) {
     if (listener != null) {
       addTransferListener(listener);
       addTransferListener(listener);

library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java

@@ -34,7 +34,7 @@ public final class DataSchemeDataSource extends BaseDataSource {
   private @Nullable byte[] data;
   private @Nullable byte[] data;
 
 
   public DataSchemeDataSource() {
   public DataSchemeDataSource() {
-    super(DataSource.TYPE_LOCAL);
+    super(/* isNetwork= */ false);
   }
   }
 
 
   @Override
   @Override

library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java

@@ -16,12 +16,9 @@
 package com.google.android.exoplayer2.upstream;
 package com.google.android.exoplayer2.upstream;
 
 
 import android.net.Uri;
 import android.net.Uri;
-import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
 import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -31,15 +28,6 @@ import java.util.Map;
  */
  */
 public interface DataSource {
 public interface DataSource {
 
 
-  /** Type of a data source. */
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({TYPE_REMOTE, TYPE_LOCAL})
-  public @interface Type {}
-  /** Data source which loads data from a remote (network) source. */
-  int TYPE_REMOTE = 0;
-  /** Data source which loads data from a local (on-device) source. */
-  int TYPE_LOCAL = 1;
-
   /**
   /**
    * A factory for {@link DataSource} instances.
    * A factory for {@link DataSource} instances.
    */
    */

library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java

@@ -155,7 +155,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
       int readTimeoutMillis,
       int readTimeoutMillis,
       boolean allowCrossProtocolRedirects,
       boolean allowCrossProtocolRedirects,
       @Nullable RequestProperties defaultRequestProperties) {
       @Nullable RequestProperties defaultRequestProperties) {
-    super(DataSource.TYPE_REMOTE);
+    super(/* isNetwork= */ true);
     this.userAgent = Assertions.checkNotEmpty(userAgent);
     this.userAgent = Assertions.checkNotEmpty(userAgent);
     this.contentTypePredicate = contentTypePredicate;
     this.contentTypePredicate = contentTypePredicate;
     this.requestProperties = new RequestProperties();
     this.requestProperties = new RequestProperties();

library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java

@@ -47,7 +47,7 @@ public final class FileDataSource extends BaseDataSource {
 
 
   /** @param listener An optional listener. */
   /** @param listener An optional listener. */
   public FileDataSource(@Nullable TransferListener<? super DataSource> listener) {
   public FileDataSource(@Nullable TransferListener<? super DataSource> listener) {
-    super(DataSource.TYPE_LOCAL);
+    super(/* isNetwork= */ false);
     if (listener != null) {
     if (listener != null) {
       addTransferListener(listener);
       addTransferListener(listener);
     }
     }

library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java

@@ -83,7 +83,7 @@ public final class RawResourceDataSource extends BaseDataSource {
    */
    */
   public RawResourceDataSource(
   public RawResourceDataSource(
       Context context, @Nullable TransferListener<? super DataSource> listener) {
       Context context, @Nullable TransferListener<? super DataSource> listener) {
-    super(DataSource.TYPE_LOCAL);
+    super(/* isNetwork= */ false);
     this.resources = context.getResources();
     this.resources = context.getResources();
     if (listener != null) {
     if (listener != null) {
       addTransferListener(listener);
       addTransferListener(listener);

library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java

@@ -86,7 +86,7 @@ public final class UdpDataSource extends BaseDataSource {
       @Nullable TransferListener<? super DataSource> listener,
       @Nullable TransferListener<? super DataSource> listener,
       int maxPacketSize,
       int maxPacketSize,
       int socketTimeoutMillis) {
       int socketTimeoutMillis) {
-    super(DataSource.TYPE_REMOTE);
+    super(/* isNetwork= */ true);
     this.socketTimeoutMillis = socketTimeoutMillis;
     this.socketTimeoutMillis = socketTimeoutMillis;
     packetBuffer = new byte[maxPacketSize];
     packetBuffer = new byte[maxPacketSize];
     packet = new DatagramPacket(packetBuffer, 0, maxPacketSize);
     packet = new DatagramPacket(packetBuffer, 0, maxPacketSize);

library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java

@@ -31,7 +31,7 @@ public class BaseDataSourceTest {
 
 
   @Test
   @Test
   public void dataTransfer_withLocalSource_isReported() throws IOException {
   public void dataTransfer_withLocalSource_isReported() throws IOException {
-    TestSource testSource = new TestSource(DataSource.TYPE_LOCAL);
+    TestSource testSource = new TestSource(/* isNetwork= */ false);
     TestTransferListener transferListener = new TestTransferListener();
     TestTransferListener transferListener = new TestTransferListener();
     testSource.addTransferListener(transferListener);
     testSource.addTransferListener(transferListener);
 
 
@@ -49,7 +49,7 @@ public class BaseDataSourceTest {
 
 
   @Test
   @Test
   public void dataTransfer_withRemoteSource_isReported() throws IOException {
   public void dataTransfer_withRemoteSource_isReported() throws IOException {
-    TestSource testSource = new TestSource(DataSource.TYPE_REMOTE);
+    TestSource testSource = new TestSource(/* isNetwork= */ true);
     TestTransferListener transferListener = new TestTransferListener();
     TestTransferListener transferListener = new TestTransferListener();
     testSource.addTransferListener(transferListener);
     testSource.addTransferListener(transferListener);
 
 
@@ -67,8 +67,8 @@ public class BaseDataSourceTest {
 
 
   private static final class TestSource extends BaseDataSource {
   private static final class TestSource extends BaseDataSource {
 
 
-    public TestSource(@DataSource.Type int type) {
-      super(type);
+    public TestSource(boolean isNetwork) {
+      super(isNetwork);
     }
     }
 
 
     @Override
     @Override

testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java

@@ -42,11 +42,10 @@ public class FakeDataSource extends BaseDataSource {
 
 
     protected final TransferListener<? super DataSource> transferListener;
     protected final TransferListener<? super DataSource> transferListener;
     protected FakeDataSet fakeDataSet;
     protected FakeDataSet fakeDataSet;
-    protected @DataSource.Type int dataSourceType;
+    protected boolean isNetwork;
 
 
     public Factory(@Nullable TransferListener<? super DataSource> transferListener) {
     public Factory(@Nullable TransferListener<? super DataSource> transferListener) {
       this.transferListener = transferListener;
       this.transferListener = transferListener;
-      this.dataSourceType = DataSource.TYPE_LOCAL;
     }
     }
 
 
     public final Factory setFakeDataSet(FakeDataSet fakeDataSet) {
     public final Factory setFakeDataSet(FakeDataSet fakeDataSet) {
@@ -54,14 +53,14 @@ public class FakeDataSource extends BaseDataSource {
       return this;
       return this;
     }
     }
 
 
-    public final Factory setDataSourceType(@DataSource.Type int dataSourceType) {
-      this.dataSourceType = dataSourceType;
+    public final Factory setIsNetwork(boolean isNetwork) {
+      this.isNetwork = isNetwork;
       return this;
       return this;
     }
     }
 
 
     @Override
     @Override
     public DataSource createDataSource() {
     public DataSource createDataSource() {
-      return new FakeDataSource(fakeDataSet, transferListener, dataSourceType);
+      return new FakeDataSource(fakeDataSet, transferListener, isNetwork);
     }
     }
   }
   }
 
 
@@ -80,14 +79,14 @@ public class FakeDataSource extends BaseDataSource {
   }
   }
 
 
   public FakeDataSource(FakeDataSet fakeDataSet) {
   public FakeDataSource(FakeDataSet fakeDataSet) {
-    this(fakeDataSet, null, DataSource.TYPE_LOCAL);
+    this(fakeDataSet, null, /* isNetwork= */ false);
   }
   }
 
 
   public FakeDataSource(
   public FakeDataSource(
       FakeDataSet fakeDataSet,
       FakeDataSet fakeDataSet,
       @Nullable TransferListener<? super DataSource> transferListener,
       @Nullable TransferListener<? super DataSource> transferListener,
-      @DataSource.Type int dataSourceType) {
-    super(dataSourceType);
+      boolean isNetwork) {
+    super(isNetwork);
     Assertions.checkNotNull(fakeDataSet);
     Assertions.checkNotNull(fakeDataSet);
     this.fakeDataSet = fakeDataSet;
     this.fakeDataSet = fakeDataSet;
     this.openedDataSpecs = new ArrayList<>();
     this.openedDataSpecs = new ArrayList<>();