diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java index 2984802526..751fbd8cf2 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java @@ -9449,8 +9449,8 @@ public class ExoPlayerTest { @Override public boolean continueLoading(LoadingInfo loadingInfo) { - super.continueLoading(loadingInfo); - if (!loader.isLoading()) { + boolean progressMade = super.continueLoading(loadingInfo); + if (progressMade && !loader.isLoading()) { loader.startLoading( loadable, new FakeLoaderCallback(), /* defaultMinRetryCount= */ 1); } diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaPeriod.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaPeriod.java index 79e64fda5b..a8b9c06b5f 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaPeriod.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaPeriod.java @@ -363,10 +363,12 @@ public class FakeMediaPeriod implements MediaPeriod { @Override public boolean continueLoading(LoadingInfo loadingInfo) { + boolean progressMade = false; for (FakeSampleStream sampleStream : sampleStreams) { sampleStream.writeData(loadingInfo.playbackPositionUs); + progressMade = true; } - return true; + return progressMade; } @Override