diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java index 4f4aee9675..eaa2fb52bb 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java @@ -190,12 +190,13 @@ public class FakeSampleStream implements SampleStream { } } sampleItemIndex = fakeSampleStreamItems.size(); - if (!fakeSampleStreamItems.isEmpty()) { - FakeSampleStreamItem lastItem = Iterables.getLast(fakeSampleStreamItems); - readEOSBuffer = - lastItem.sampleInfo != null - && ((lastItem.sampleInfo.flags & C.BUFFER_FLAG_END_OF_STREAM) != 0); - } + @Nullable + FakeSampleStreamItem lastItem = + Iterables.getLast(fakeSampleStreamItems, /* defaultValue= */ null); + readEOSBuffer = + lastItem != null + && lastItem.sampleInfo != null + && ((lastItem.sampleInfo.flags & C.BUFFER_FLAG_END_OF_STREAM) != 0); } /**