Commit dd5905a9 by olly Committed by Oliver Woodman

Don't query empty timeline for next/previous windows

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173668909
parent 4cf90e32
...@@ -331,14 +331,14 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -331,14 +331,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
@Override @Override
public int getNextWindowIndex() { public int getNextWindowIndex() {
return timeline.getNextWindowIndex(getCurrentWindowIndex(), getRepeatMode(), return timeline.isEmpty() ? C.INDEX_UNSET
getShuffleModeEnabled()); : timeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
} }
@Override @Override
public int getPreviousWindowIndex() { public int getPreviousWindowIndex() {
return timeline.getPreviousWindowIndex(getCurrentWindowIndex(), getRepeatMode(), return timeline.isEmpty() ? C.INDEX_UNSET
getShuffleModeEnabled()); : timeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
} }
@Override @Override
......
...@@ -564,7 +564,7 @@ public abstract class Timeline { ...@@ -564,7 +564,7 @@ public abstract class Timeline {
boolean shuffleModeEnabled) { boolean shuffleModeEnabled) {
switch (repeatMode) { switch (repeatMode) {
case Player.REPEAT_MODE_OFF: case Player.REPEAT_MODE_OFF:
return windowIndex == getLastWindowIndex(shuffleModeEnabled) ? C.INDEX_UNSET return windowIndex == getLastWindowIndex(shuffleModeEnabled) ? C.INDEX_UNSET
: windowIndex + 1; : windowIndex + 1;
case Player.REPEAT_MODE_ONE: case Player.REPEAT_MODE_ONE:
return windowIndex; return windowIndex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment