From 125a8d3caabfaecc22fae303fea60aeda93b9f64 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Wed, 30 Jun 2021 13:41:35 +0100 Subject: [PATCH] Merge pull request #9119 from chvp:media2-dispatch-previous-next PiperOrigin-RevId: 381833313 --- .../exoplayer2/ext/media2/PlayerWrapper.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java index f4d934bcf9..ea29ccbe53 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java @@ -231,23 +231,11 @@ import java.util.List; } public boolean skipToPreviousPlaylistItem() { - Timeline timeline = player.getCurrentTimeline(); - Assertions.checkState(!timeline.isEmpty()); - int previousWindowIndex = player.getPreviousWindowIndex(); - if (previousWindowIndex != C.INDEX_UNSET) { - return controlDispatcher.dispatchSeekTo(player, previousWindowIndex, C.TIME_UNSET); - } - return false; + return controlDispatcher.dispatchPrevious(player); } public boolean skipToNextPlaylistItem() { - Timeline timeline = player.getCurrentTimeline(); - Assertions.checkState(!timeline.isEmpty()); - int nextWindowIndex = player.getNextWindowIndex(); - if (nextWindowIndex != C.INDEX_UNSET) { - return controlDispatcher.dispatchSeekTo(player, nextWindowIndex, C.TIME_UNSET); - } - return false; + return controlDispatcher.dispatchNext(player); } public boolean skipToPlaylistItem(@IntRange(from = 0) int index) {