diff --git a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java index 3187aa4788..387d5e42e8 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java @@ -217,7 +217,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager { * Provides access to {@link MediaDrm#setPropertyString(String, String)}. *
* This method may be called when the manager is in any state. - * + * * @param key The property to write. * @param value The value to write. */ diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java b/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java index 6eb477fd0d..d3ce6bdc9c 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java +++ b/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java @@ -128,21 +128,6 @@ public final class Loader { startLoading(myLooper, loadable, callback); } - /** - * Invokes {@link #startLoading(Looper, Loadable, Callback)}, using the {@link Looper} - * associated with the calling thread. Loading is delayed by {@code delayMs}. - * - * @param loadable The {@link Loadable} to load. - * @param callback A callback to invoke when the load ends. - * @param delayMs Number of milliseconds to wait before calling {@link Loadable#load()}. - * @throws IllegalStateException If the calling thread does not have an associated {@link Looper}. - */ - public void startLoading(Loadable loadable, Callback callback, int delayMs) { - Looper myLooper = Looper.myLooper(); - Assertions.checkState(myLooper != null); - startLoading(myLooper, loadable, callback, delayMs); - } - /** * Start loading a {@link Loadable}. *
@@ -154,24 +139,9 @@ public final class Loader { * @param callback A callback to invoke when the load ends. */ public void startLoading(Looper looper, Loadable loadable, Callback callback) { - startLoading(looper, loadable, callback, 0); - } - - /** - * Start loading a {@link Loadable} after {@code delayMs} has elapsed. - *
- * A {@link Loader} instance can only load one {@link Loadable} at a time, and so this method - * must not be called when another load is in progress. - * - * @param looper The looper of the thread on which the callback should be invoked. - * @param loadable The {@link Loadable} to load. - * @param callback A callback to invoke when the load ends. - * @param delayMs Number of milliseconds to wait before calling {@link Loadable#load()}. - */ - public void startLoading(Looper looper, Loadable loadable, Callback callback, int delayMs) { Assertions.checkState(!loading); loading = true; - currentTask = new LoadTask(looper, loadable, callback, delayMs); + currentTask = new LoadTask(looper, loadable, callback); downloadExecutorService.submit(currentTask); } @@ -213,15 +183,13 @@ public final class Loader { private final Loadable loadable; private final Loader.Callback callback; - private final int delayMs; private volatile Thread executorThread; - public LoadTask(Looper looper, Loadable loadable, Loader.Callback callback, int delayMs) { + public LoadTask(Looper looper, Loadable loadable, Loader.Callback callback) { super(looper); this.loadable = loadable; this.callback = callback; - this.delayMs = delayMs; } public void quit() { @@ -235,9 +203,6 @@ public final class Loader { public void run() { try { executorThread = Thread.currentThread(); - if (delayMs > 0) { - Thread.sleep(delayMs); - } if (!loadable.isLoadCanceled()) { loadable.load(); }