From 6f504264e04245f1d2602e1c4de6a34fde16a865 Mon Sep 17 00:00:00 2001 From: claincly Date: Wed, 21 Jul 2021 12:45:02 +0100 Subject: [PATCH] Merge the handling of FileDataSourceException and DataSourceException. FileDataSourceException subclasses DataSourceException and can be handled in the same fashion. PiperOrigin-RevId: 385983103 --- .../com/google/android/exoplayer2/ExoPlayerImplInternal.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java index 0975378671..5821f07cf0 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java @@ -49,7 +49,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelectorResult; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSourceException; -import com.google.android.exoplayer2.upstream.FileDataSource; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.HandlerWrapper; @@ -577,8 +576,6 @@ import java.util.concurrent.atomic.AtomicBoolean; } } catch (DrmSession.DrmSessionException e) { handleIoException(e, e.errorCode); - } catch (FileDataSource.FileDataSourceException e) { - handleIoException(e, e.reason); } catch (ParserException e) { @ErrorCode int errorCode; if (e.dataType == C.DATA_TYPE_MEDIA) {