From c11b5cf91c7f3f3e42aa6f3d62b51d6a812be799 Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 16 Nov 2022 18:07:00 +0000 Subject: [PATCH] Fix NPE when listener is not set PiperOrigin-RevId: 488970696 (cherry picked from commit f3ed9e359dfdff2a99bf8766ffceb59a93d1bc93) --- .../androidx/media3/exoplayer/audio/DefaultAudioSink.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java index bd77a50cac..9ca07c700a 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java @@ -1000,9 +1000,11 @@ public final class DefaultAudioSink implements AudioSink { getSubmittedFrames() - trimmingAudioProcessor.getTrimmedFrameCount()); if (!startMediaTimeUsNeedsSync && Math.abs(expectedPresentationTimeUs - presentationTimeUs) > 200000) { - listener.onAudioSinkError( - new AudioSink.UnexpectedDiscontinuityException( - presentationTimeUs, expectedPresentationTimeUs)); + if (listener != null) { + listener.onAudioSinkError( + new AudioSink.UnexpectedDiscontinuityException( + presentationTimeUs, expectedPresentationTimeUs)); + } startMediaTimeUsNeedsSync = true; } if (startMediaTimeUsNeedsSync) {