loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ExoPlaybackException's cause field

Browse Source 
It was originally introduced because it was guaranteed to be non-null
unlike the inherited field. But ExoPlaybackException.cause has been
nullable for some time, so there's no gain in not using the inherited
field.

PiperOrigin-RevId: 372329740
This commit is contained in:
aquilescanta 2021-05-06 14:29:42 +01:00 committed by bachinger
parent a9fc3185fe
commit 1408fe0403
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
View File

@ -111,8 +111,6 @@ public final class ExoPlaybackException extends Exception implements Bundleable
*/ */
/* package */ final boolean isRecoverable; /* package */ final boolean isRecoverable;
@Nullable private final Throwable cause;
/** /**
* Creates an instance of type {@link #TYPE_SOURCE}. * Creates an instance of type {@link #TYPE_SOURCE}.
* *
@ -282,8 +280,8 @@ public final class ExoPlaybackException extends Exception implements Bundleable
boolean isRecoverable) { boolean isRecoverable) {
super(message, cause); super(message, cause);
Assertions.checkArgument(!isRecoverable || type == TYPE_RENDERER); Assertions.checkArgument(!isRecoverable || type == TYPE_RENDERER);
Assertions.checkArgument(cause != null || type == TYPE_REMOTE);
this.type = type; this.type = type;
this.cause = cause;
this.rendererName = rendererName; this.rendererName = rendererName;
this.rendererIndex = rendererIndex; this.rendererIndex = rendererIndex;
this.rendererFormat = rendererFormat; this.rendererFormat = rendererFormat;
@ -300,7 +298,7 @@ public final class ExoPlaybackException extends Exception implements Bundleable
*/ */
public IOException getSourceException() { public IOException getSourceException() {
Assertions.checkState(type == TYPE_SOURCE); Assertions.checkState(type == TYPE_SOURCE);
return (IOException) Assertions.checkNotNull(cause); return (IOException) Assertions.checkNotNull(getCause());
} }
/** /**
@ -310,7 +308,7 @@ public final class ExoPlaybackException extends Exception implements Bundleable
*/ */
public Exception getRendererException() { public Exception getRendererException() {
Assertions.checkState(type == TYPE_RENDERER); Assertions.checkState(type == TYPE_RENDERER);
return (Exception) Assertions.checkNotNull(cause); return (Exception) Assertions.checkNotNull(getCause());
} }
/** /**
@ -320,7 +318,7 @@ public final class ExoPlaybackException extends Exception implements Bundleable
*/ */
public RuntimeException getUnexpectedException() { public RuntimeException getUnexpectedException() {
Assertions.checkState(type == TYPE_UNEXPECTED); Assertions.checkState(type == TYPE_UNEXPECTED);
return (RuntimeException) Assertions.checkNotNull(cause); return (RuntimeException) Assertions.checkNotNull(getCause());
} }
/** /**
@ -333,7 +331,7 @@ public final class ExoPlaybackException extends Exception implements Bundleable
/* package */ ExoPlaybackException copyWithMediaPeriodId(@Nullable MediaPeriodId mediaPeriodId) { /* package */ ExoPlaybackException copyWithMediaPeriodId(@Nullable MediaPeriodId mediaPeriodId) {
return new ExoPlaybackException( return new ExoPlaybackException(
Util.castNonNull(getMessage()), Util.castNonNull(getMessage()),
cause, getCause(),
type, type,
rendererName, rendererName,
rendererIndex, rendererIndex,
@ -427,6 +425,7 @@ public final class ExoPlaybackException extends Exception implements Bundleable
bundle.putInt(keyForField(FIELD_RENDERER_FORMAT_SUPPORT), rendererFormatSupport); bundle.putInt(keyForField(FIELD_RENDERER_FORMAT_SUPPORT), rendererFormatSupport);
bundle.putLong(keyForField(FIELD_TIME_STAMP_MS), timestampMs); bundle.putLong(keyForField(FIELD_TIME_STAMP_MS), timestampMs);
bundle.putBoolean(keyForField(FIELD_IS_RECOVERABLE), isRecoverable); bundle.putBoolean(keyForField(FIELD_IS_RECOVERABLE), isRecoverable);
@Nullable Throwable cause = getCause();
if (cause != null) { if (cause != null) {
bundle.putString(keyForField(FIELD_CAUSE_CLASS_NAME), cause.getClass().getName()); bundle.putString(keyForField(FIELD_CAUSE_CLASS_NAME), cause.getClass().getName());
bundle.putString(keyForField(FIELD_CAUSE_MESSAGE), cause.getMessage()); bundle.putString(keyForField(FIELD_CAUSE_MESSAGE), cause.getMessage());