Commit 6f504264 by claincly Committed by Ian Baker

Merge the handling of FileDataSourceException and DataSourceException.

FileDataSourceException subclasses DataSourceException and can be handled
in the same fashion.

PiperOrigin-RevId: 385983103
parent e4c9078a
...@@ -49,7 +49,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelector; ...@@ -49,7 +49,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelectorResult; import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.BandwidthMeter;
import com.google.android.exoplayer2.upstream.DataSourceException; 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.Assertions;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.HandlerWrapper; import com.google.android.exoplayer2.util.HandlerWrapper;
...@@ -577,8 +576,6 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -577,8 +576,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
} }
} catch (DrmSession.DrmSessionException e) { } catch (DrmSession.DrmSessionException e) {
handleIoException(e, e.errorCode); handleIoException(e, e.errorCode);
} catch (FileDataSource.FileDataSourceException e) {
handleIoException(e, e.reason);
} catch (ParserException e) { } catch (ParserException e) {
@ErrorCode int errorCode; @ErrorCode int errorCode;
if (e.dataType == C.DATA_TYPE_MEDIA) { if (e.dataType == C.DATA_TYPE_MEDIA) {
......
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