diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java index 13e75ca9c2..6cac50db81 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java @@ -35,7 +35,6 @@ import com.google.android.exoplayer2.offline.DownloadService; import com.google.android.exoplayer2.offline.DownloadState; import com.google.android.exoplayer2.offline.DownloadStateCursor; import com.google.android.exoplayer2.offline.StreamKey; -import com.google.android.exoplayer2.scheduler.Requirements; import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.util.Log; @@ -129,11 +128,6 @@ public class DownloadTracker implements DownloadManager.Listener { // DownloadManager.Listener - @Override - public void onInitialized(DownloadManager downloadManager) { - // Do nothing. - } - @Override public void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState) { if (downloadState.state == DownloadState.STATE_REMOVED @@ -145,19 +139,6 @@ public class DownloadTracker implements DownloadManager.Listener { } } - @Override - public void onIdle(DownloadManager downloadManager) { - // Do nothing. - } - - @Override - public void onRequirementsStateChanged( - DownloadManager downloadManager, - Requirements requirements, - @Requirements.RequirementFlags int notMetRequirements) { - // Do nothing. - } - // Internal methods private void loadTrackedActions() { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java index 7cfe02eeb1..6b47299de5 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java @@ -68,21 +68,23 @@ public final class DownloadManager { * * @param downloadManager The reporting instance. */ - void onInitialized(DownloadManager downloadManager); + default void onInitialized(DownloadManager downloadManager) {} + /** * Called when the state of a download changes. * * @param downloadManager The reporting instance. * @param downloadState The state of the download. */ - void onDownloadStateChanged(DownloadManager downloadManager, DownloadState downloadState); + default void onDownloadStateChanged( + DownloadManager downloadManager, DownloadState downloadState) {} /** * Called when there is no active download left. * * @param downloadManager The reporting instance. */ - void onIdle(DownloadManager downloadManager); + default void onIdle(DownloadManager downloadManager) {} /** * Called when the download requirements state changed. @@ -92,10 +94,10 @@ public final class DownloadManager { * @param notMetRequirements {@link Requirements.RequirementFlags RequirementFlags} that are not * met, or 0. */ - void onRequirementsStateChanged( + default void onRequirementsStateChanged( DownloadManager downloadManager, Requirements requirements, - @Requirements.RequirementFlags int notMetRequirements); + @Requirements.RequirementFlags int notMetRequirements) {} } /** The default maximum number of simultaneous downloads. */ diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java index 3a782d80a7..b95e88cba8 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java @@ -532,11 +532,6 @@ public abstract class DownloadService extends Service { } } - @Override - public void onInitialized(DownloadManager downloadManager) { - // Do nothing. - } - @Override public void onDownloadStateChanged( DownloadManager downloadManager, DownloadState downloadState) { diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java index 2109cceda8..8216b881f3 100644 --- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java +++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.os.ConditionVariable; import com.google.android.exoplayer2.offline.DownloadManager; import com.google.android.exoplayer2.offline.DownloadState; -import com.google.android.exoplayer2.scheduler.Requirements; import java.util.HashMap; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.CountDownLatch; @@ -83,12 +82,6 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen } } - @Override - public void onRequirementsStateChanged( - DownloadManager downloadManager, Requirements requirements, int notMetRequirements) { - // Do nothing. - } - /** * Blocks until all remove and download tasks are complete and throws an exception if there was an * error.