mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Minor fix: remove final from methods of final class
#minor-release PiperOrigin-RevId: 453408087 (cherry picked from commit 62497f23fd8f92de304e7a87ffa839e221bd78c6)
This commit is contained in:
parent
240379cc02
commit
2ed7efb1c3
@ -576,7 +576,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @param disabled Whether the renderer is disabled.
|
||||
* @return This builder.
|
||||
*/
|
||||
public final ParametersBuilder setRendererDisabled(int rendererIndex, boolean disabled) {
|
||||
public ParametersBuilder setRendererDisabled(int rendererIndex, boolean disabled) {
|
||||
delegate.setRendererDisabled(rendererIndex, disabled);
|
||||
return this;
|
||||
}
|
||||
@ -606,7 +606,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final ParametersBuilder setSelectionOverride(
|
||||
public ParametersBuilder setSelectionOverride(
|
||||
int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
|
||||
delegate.setSelectionOverride(rendererIndex, groups, override);
|
||||
return this;
|
||||
@ -621,8 +621,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final ParametersBuilder clearSelectionOverride(
|
||||
int rendererIndex, TrackGroupArray groups) {
|
||||
public ParametersBuilder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
delegate.clearSelectionOverride(rendererIndex, groups);
|
||||
return this;
|
||||
}
|
||||
@ -635,7 +634,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final ParametersBuilder clearSelectionOverrides(int rendererIndex) {
|
||||
public ParametersBuilder clearSelectionOverrides(int rendererIndex) {
|
||||
delegate.clearSelectionOverrides(rendererIndex);
|
||||
return this;
|
||||
}
|
||||
@ -647,7 +646,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final ParametersBuilder clearSelectionOverrides() {
|
||||
public ParametersBuilder clearSelectionOverrides() {
|
||||
delegate.clearSelectionOverrides();
|
||||
return this;
|
||||
}
|
||||
@ -1250,7 +1249,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @param disabled Whether the renderer is disabled.
|
||||
* @return This builder.
|
||||
*/
|
||||
public final Builder setRendererDisabled(int rendererIndex, boolean disabled) {
|
||||
public Builder setRendererDisabled(int rendererIndex, boolean disabled) {
|
||||
if (rendererDisabledFlags.get(rendererIndex) == disabled) {
|
||||
// The disabled flag is unchanged.
|
||||
return this;
|
||||
@ -1290,7 +1289,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final Builder setSelectionOverride(
|
||||
public Builder setSelectionOverride(
|
||||
int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
|
||||
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
|
||||
selectionOverrides.get(rendererIndex);
|
||||
@ -1315,7 +1314,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final Builder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
public Builder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
|
||||
selectionOverrides.get(rendererIndex);
|
||||
if (overrides == null || !overrides.containsKey(groups)) {
|
||||
@ -1337,7 +1336,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final Builder clearSelectionOverrides(int rendererIndex) {
|
||||
public Builder clearSelectionOverrides(int rendererIndex) {
|
||||
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
|
||||
selectionOverrides.get(rendererIndex);
|
||||
if (overrides == null || overrides.isEmpty()) {
|
||||
@ -1355,7 +1354,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
|
||||
*/
|
||||
@Deprecated
|
||||
public final Builder clearSelectionOverrides() {
|
||||
public Builder clearSelectionOverrides() {
|
||||
if (selectionOverrides.size() == 0) {
|
||||
// Nothing to clear.
|
||||
return this;
|
||||
@ -1582,7 +1581,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* @param rendererIndex The renderer index.
|
||||
* @return Whether the renderer is disabled.
|
||||
*/
|
||||
public final boolean getRendererDisabled(int rendererIndex) {
|
||||
public boolean getRendererDisabled(int rendererIndex) {
|
||||
return rendererDisabledFlags.get(rendererIndex);
|
||||
}
|
||||
|
||||
@ -1597,7 +1596,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
* TrackSelectionParameters#overrides} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public final boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
public boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
@Nullable
|
||||
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
|
||||
selectionOverrides.get(rendererIndex);
|
||||
@ -1616,7 +1615,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
*/
|
||||
@Deprecated
|
||||
@Nullable
|
||||
public final SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
public SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) {
|
||||
@Nullable
|
||||
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
|
||||
selectionOverrides.get(rendererIndex);
|
||||
@ -1629,7 +1628,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
||||
return new Parameters.Builder(this);
|
||||
}
|
||||
|
||||
@SuppressWarnings("EqualsGetClass") // Class is not final for backward-compatibility reason.
|
||||
@SuppressWarnings(
|
||||
"EqualsGetClass") // Class extends TrackSelectionParameters for backwards compatibility.
|
||||
@Override
|
||||
public boolean equals(@Nullable Object obj) {
|
||||
if (this == obj) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user