From aff9e731b253a8ad65f06f5b6aa62944d2c4af4c Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 2 Sep 2019 11:46:14 +0100 Subject: [PATCH] Move DefaultHttpDataSource request header explanation to class Javadoc. The Javadoc for open() won't be read by anyone because it's an overridden method of the interface and not called directly from application code. Move doc to class documentation as this is a generic explanation about the functionality of the class. Also added "all" to clarify that all the parameters will be added and the order of preference just applies in case of key clashes. PiperOrigin-RevId: 266753249 --- .../exoplayer2/upstream/DefaultHttpDataSource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index c5b3c0b08b..37329a4868 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -52,6 +52,10 @@ import java.util.zip.GZIPInputStream; * HTTP to HTTPS or vice versa). Cross-protocol redirects can be enabled by using the {@link * #DefaultHttpDataSource(String, Predicate, int, int, boolean, RequestProperties)} constructor and * passing {@code true} as the second last argument. + * + *

Note: HTTP request headers will be set using all parameters passed via (in order of decreasing + * priority) the {@code dataSpec}, {@link #setRequestProperty} and the default parameters used to + * construct the instance. */ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSource { @@ -265,10 +269,6 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou /** * Opens the source to read the specified data. - * - *

Note: HTTP request headers will be set using parameters passed via (in order of decreasing - * priority) the {@code dataSpec}, {@link #setRequestProperty} and the default parameters used to - * construct the instance. */ @Override public long open(DataSpec dataSpec) throws HttpDataSourceException {