Skip to content

SDK / exoplayer

Go to a project
Commit 64d33adc by christosts Committed by Marc Baechinger
Options

Minor fix: remove final from methods of final class 

#minor-release

PiperOrigin-RevId: 453408087
(cherry picked from commit 527db57b)
parent b7cf772a
Inline Side-by-side
Showing with 15 additions and 15 deletions
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
...@@ -572,7 +572,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -572,7 +572,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @param disabled Whether the renderer is disabled. * @param disabled Whether the renderer is disabled.
* @return This builder. * @return This builder.
*/ */
public final ParametersBuilder setRendererDisabled(int rendererIndex, boolean disabled) { public ParametersBuilder setRendererDisabled(int rendererIndex, boolean disabled) {
delegate.setRendererDisabled(rendererIndex, disabled); delegate.setRendererDisabled(rendererIndex, disabled);
return this; return this;
} }
...@@ -602,7 +602,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -602,7 +602,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}. * @deprecated Use {@link TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
*/ */
@Deprecated @Deprecated
public final ParametersBuilder setSelectionOverride( public ParametersBuilder setSelectionOverride(
int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) { int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
delegate.setSelectionOverride(rendererIndex, groups, override); delegate.setSelectionOverride(rendererIndex, groups, override);
return this; return this;
...@@ -617,8 +617,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -617,8 +617,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}. * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
*/ */
@Deprecated @Deprecated
public final ParametersBuilder clearSelectionOverride( public ParametersBuilder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) {
int rendererIndex, TrackGroupArray groups) {
delegate.clearSelectionOverride(rendererIndex, groups); delegate.clearSelectionOverride(rendererIndex, groups);
return this; return this;
} }
...@@ -631,7 +630,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -631,7 +630,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}. * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
*/ */
@Deprecated @Deprecated
public final ParametersBuilder clearSelectionOverrides(int rendererIndex) { public ParametersBuilder clearSelectionOverrides(int rendererIndex) {
delegate.clearSelectionOverrides(rendererIndex); delegate.clearSelectionOverrides(rendererIndex);
return this; return this;
} }
...@@ -643,7 +642,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -643,7 +642,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}. * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
*/ */
@Deprecated @Deprecated
public final ParametersBuilder clearSelectionOverrides() { public ParametersBuilder clearSelectionOverrides() {
delegate.clearSelectionOverrides(); delegate.clearSelectionOverrides();
return this; return this;
} }
...@@ -1246,7 +1245,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1246,7 +1245,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @param disabled Whether the renderer is disabled. * @param disabled Whether the renderer is disabled.
* @return This builder. * @return This builder.
*/ */
public final Builder setRendererDisabled(int rendererIndex, boolean disabled) { public Builder setRendererDisabled(int rendererIndex, boolean disabled) {
if (rendererDisabledFlags.get(rendererIndex) == disabled) { if (rendererDisabledFlags.get(rendererIndex) == disabled) {
// The disabled flag is unchanged. // The disabled flag is unchanged.
return this; return this;
...@@ -1286,7 +1285,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1286,7 +1285,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}. * TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
*/ */
@Deprecated @Deprecated
public final Builder setSelectionOverride( public Builder setSelectionOverride(
int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) { int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
Map<TrackGroupArray, @NullableType SelectionOverride> overrides = Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
selectionOverrides.get(rendererIndex); selectionOverrides.get(rendererIndex);
...@@ -1311,7 +1310,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1311,7 +1310,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}. * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
*/ */
@Deprecated @Deprecated
public final Builder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) { public Builder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) {
Map<TrackGroupArray, @NullableType SelectionOverride> overrides = Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
selectionOverrides.get(rendererIndex); selectionOverrides.get(rendererIndex);
if (overrides == null || !overrides.containsKey(groups)) { if (overrides == null || !overrides.containsKey(groups)) {
...@@ -1333,7 +1332,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1333,7 +1332,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}. * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
*/ */
@Deprecated @Deprecated
public final Builder clearSelectionOverrides(int rendererIndex) { public Builder clearSelectionOverrides(int rendererIndex) {
Map<TrackGroupArray, @NullableType SelectionOverride> overrides = Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
selectionOverrides.get(rendererIndex); selectionOverrides.get(rendererIndex);
if (overrides == null || overrides.isEmpty()) { if (overrides == null || overrides.isEmpty()) {
...@@ -1351,7 +1350,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1351,7 +1350,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}. * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
*/ */
@Deprecated @Deprecated
public final Builder clearSelectionOverrides() { public Builder clearSelectionOverrides() {
if (selectionOverrides.size() == 0) { if (selectionOverrides.size() == 0) {
// Nothing to clear. // Nothing to clear.
return this; return this;
...@@ -1578,7 +1577,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1578,7 +1577,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* @param rendererIndex The renderer index. * @param rendererIndex The renderer index.
* @return Whether the renderer is disabled. * @return Whether the renderer is disabled.
*/ */
public final boolean getRendererDisabled(int rendererIndex) { public boolean getRendererDisabled(int rendererIndex) {
return rendererDisabledFlags.get(rendererIndex); return rendererDisabledFlags.get(rendererIndex);
} }
...@@ -1593,7 +1592,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1593,7 +1592,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* TrackSelectionParameters#overrides} instead. * TrackSelectionParameters#overrides} instead.
*/ */
@Deprecated @Deprecated
public final boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) { public boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) {
@Nullable @Nullable
Map<TrackGroupArray, @NullableType SelectionOverride> overrides = Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
selectionOverrides.get(rendererIndex); selectionOverrides.get(rendererIndex);
...@@ -1612,7 +1611,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1612,7 +1611,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
*/ */
@Deprecated @Deprecated
@Nullable @Nullable
public final SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) { public SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) {
@Nullable @Nullable
Map<TrackGroupArray, @NullableType SelectionOverride> overrides = Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
selectionOverrides.get(rendererIndex); selectionOverrides.get(rendererIndex);
...@@ -1625,7 +1624,8 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1625,7 +1624,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return new Parameters.Builder(this); return new Parameters.Builder(this);
} }
@SuppressWarnings("EqualsGetClass") // Class is not final for backward-compatibility reason. @SuppressWarnings(
"EqualsGetClass") // Class extends TrackSelectionParameters for backwards compatibility.
@Override @Override
public boolean equals(@Nullable Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
......
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