Visibility clean-up: Don't extend visibility of protected methods in overrides.

PiperOrigin-RevId: 255412493
This commit is contained in:
tonihei 2019-06-27 17:03:54 +01:00 committed by Oliver Woodman
parent 1bd73eb70e
commit 2a765f6b5a
13 changed files with 24 additions and 24 deletions

View File

@ -193,7 +193,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
prepareChildSource(/* id= */ null, mediaSource); prepareChildSource(/* id= */ null, mediaSource);
} }
@ -228,7 +228,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
super.releaseSourceInternal(); super.releaseSourceInternal();
clippingError = null; clippingError = null;
clippingTimeline = null; clippingTimeline = null;

View File

@ -44,7 +44,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
@Override @Override
@CallSuper @CallSuper
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener; this.mediaTransferListener = mediaTransferListener;
eventHandler = new Handler(); eventHandler = new Handler();
} }
@ -59,7 +59,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
@Override @Override
@CallSuper @CallSuper
public void releaseSourceInternal() { protected void releaseSourceInternal() {
for (MediaSourceAndListener childSource : childSources.values()) { for (MediaSourceAndListener childSource : childSources.values()) {
childSource.mediaSource.releaseSource(childSource.listener); childSource.mediaSource.releaseSource(childSource.listener);
childSource.mediaSource.removeEventListener(childSource.eventListener); childSource.mediaSource.removeEventListener(childSource.eventListener);

View File

@ -339,7 +339,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
progressiveMediaSource.prepareSource(/* listener= */ this, mediaTransferListener); progressiveMediaSource.prepareSource(/* listener= */ this, mediaTransferListener);
} }
@ -359,7 +359,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
progressiveMediaSource.releaseSource(/* listener= */ this); progressiveMediaSource.releaseSource(/* listener= */ this);
} }

View File

@ -71,7 +71,7 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
prepareChildSource(/* id= */ null, childSource); prepareChildSource(/* id= */ null, childSource);
} }

View File

@ -104,7 +104,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
for (int i = 0; i < mediaSources.length; i++) { for (int i = 0; i < mediaSources.length; i++) {
prepareChildSource(i, mediaSources[i]); prepareChildSource(i, mediaSources[i]);
@ -140,7 +140,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
super.releaseSourceInternal(); super.releaseSourceInternal();
Arrays.fill(timelines, null); Arrays.fill(timelines, null);
primaryManifest = null; primaryManifest = null;

View File

@ -228,7 +228,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
transferListener = mediaTransferListener; transferListener = mediaTransferListener;
notifySourceInfoRefreshed(timelineDurationUs, timelineIsSeekable); notifySourceInfoRefreshed(timelineDurationUs, timelineIsSeekable);
} }
@ -262,7 +262,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
// Do nothing. // Do nothing.
} }

View File

@ -66,7 +66,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
refreshSourceInfo( refreshSourceInfo(
new SinglePeriodTimeline(durationUs, /* isSeekable= */ true, /* isDynamic= */ false), new SinglePeriodTimeline(durationUs, /* isSeekable= */ true, /* isDynamic= */ false),
/* manifest= */ null); /* manifest= */ null);
@ -84,7 +84,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
public void releasePeriod(MediaPeriod mediaPeriod) {} public void releasePeriod(MediaPeriod mediaPeriod) {}
@Override @Override
public void releaseSourceInternal() {} protected void releaseSourceInternal() {}
private static final class SilenceMediaPeriod implements MediaPeriod { private static final class SilenceMediaPeriod implements MediaPeriod {

View File

@ -302,7 +302,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
transferListener = mediaTransferListener; transferListener = mediaTransferListener;
refreshSourceInfo(timeline, /* manifest= */ null); refreshSourceInfo(timeline, /* manifest= */ null);
} }
@ -331,7 +331,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
// Do nothing. // Do nothing.
} }

View File

@ -193,7 +193,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
super.prepareSourceInternal(mediaTransferListener); super.prepareSourceInternal(mediaTransferListener);
ComponentListener componentListener = new ComponentListener(); ComponentListener componentListener = new ComponentListener();
this.componentListener = componentListener; this.componentListener = componentListener;
@ -259,7 +259,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
super.releaseSourceInternal(); super.releaseSourceInternal();
Assertions.checkNotNull(componentListener).release(); Assertions.checkNotNull(componentListener).release();
componentListener = null; componentListener = null;

View File

@ -630,7 +630,7 @@ public final class DashMediaSource extends BaseMediaSource {
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener; this.mediaTransferListener = mediaTransferListener;
if (sideloadedManifest) { if (sideloadedManifest) {
processManifest(false); processManifest(false);
@ -679,7 +679,7 @@ public final class DashMediaSource extends BaseMediaSource {
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
manifestLoadPending = false; manifestLoadPending = false;
dataSource = null; dataSource = null;
if (loader != null) { if (loader != null) {

View File

@ -333,7 +333,7 @@ public final class HlsMediaSource extends BaseMediaSource
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener; this.mediaTransferListener = mediaTransferListener;
EventDispatcher eventDispatcher = createEventDispatcher(/* mediaPeriodId= */ null); EventDispatcher eventDispatcher = createEventDispatcher(/* mediaPeriodId= */ null);
playlistTracker.start(manifestUri, eventDispatcher, /* listener= */ this); playlistTracker.start(manifestUri, eventDispatcher, /* listener= */ this);
@ -366,7 +366,7 @@ public final class HlsMediaSource extends BaseMediaSource
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
playlistTracker.stop(); playlistTracker.stop();
} }

View File

@ -525,7 +525,7 @@ public final class SsMediaSource extends BaseMediaSource
} }
@Override @Override
public void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) { protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener; this.mediaTransferListener = mediaTransferListener;
if (sideloadedManifest) { if (sideloadedManifest) {
manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy(); manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy();
@ -568,7 +568,7 @@ public final class SsMediaSource extends BaseMediaSource
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
manifest = sideloadedManifest ? manifest : null; manifest = sideloadedManifest ? manifest : null;
manifestDataSource = null; manifestDataSource = null;
manifestLoadStartTimestamp = 0; manifestLoadStartTimestamp = 0;

View File

@ -137,7 +137,7 @@ public class FakeMediaSource extends BaseMediaSource {
} }
@Override @Override
public void releaseSourceInternal() { protected void releaseSourceInternal() {
assertThat(preparedSource).isTrue(); assertThat(preparedSource).isTrue();
assertThat(releasedSource).isFalse(); assertThat(releasedSource).isFalse();
assertThat(activeMediaPeriods.isEmpty()).isTrue(); assertThat(activeMediaPeriods.isEmpty()).isTrue();