mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Add missing Nullable annotation Player.EventListener.onTimelineChanged
Issue: #4593 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=206911927
This commit is contained in:
parent
5715960304
commit
45c1e9eef3
@ -17,6 +17,7 @@ package com.google.android.exoplayer2.castdemo;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
import android.view.KeyEvent;
|
import android.view.KeyEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import com.google.android.exoplayer2.C;
|
import com.google.android.exoplayer2.C;
|
||||||
@ -276,7 +277,7 @@ import java.util.ArrayList;
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(
|
public void onTimelineChanged(
|
||||||
Timeline timeline, Object manifest, @TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
|
||||||
updateCurrentItemIndex();
|
updateCurrentItemIndex();
|
||||||
if (timeline.isEmpty()) {
|
if (timeline.isEmpty()) {
|
||||||
castMediaQueueCreationPending = true;
|
castMediaQueueCreationPending = true;
|
||||||
|
@ -837,8 +837,8 @@ public final class ImaAdsLoader
|
|||||||
// Player.EventListener implementation.
|
// Player.EventListener implementation.
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest,
|
public void onTimelineChanged(
|
||||||
@Player.TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
|
||||||
if (reason == Player.TIMELINE_CHANGE_REASON_RESET) {
|
if (reason == Player.TIMELINE_CHANGE_REASON_RESET) {
|
||||||
// The player is being reset and this source will be released.
|
// The player is being reset and this source will be released.
|
||||||
return;
|
return;
|
||||||
|
@ -288,8 +288,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest,
|
public void onTimelineChanged(
|
||||||
@TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
|
||||||
Callback callback = getCallback();
|
Callback callback = getCallback();
|
||||||
callback.onDurationChanged(LeanbackPlayerAdapter.this);
|
callback.onDurationChanged(LeanbackPlayerAdapter.this);
|
||||||
callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
|
callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
|
||||||
|
@ -774,7 +774,7 @@ public final class MediaSessionConnector {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(
|
public void onTimelineChanged(
|
||||||
Timeline timeline, Object manifest, @Player.TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
|
||||||
int windowCount = player.getCurrentTimeline().getWindowCount();
|
int windowCount = player.getCurrentTimeline().getWindowCount();
|
||||||
int windowIndex = player.getCurrentWindowIndex();
|
int windowIndex = player.getCurrentWindowIndex();
|
||||||
if (queueNavigator != null) {
|
if (queueNavigator != null) {
|
||||||
|
@ -248,7 +248,7 @@ public interface Player {
|
|||||||
* @param reason The {@link TimelineChangeReason} responsible for this timeline change.
|
* @param reason The {@link TimelineChangeReason} responsible for this timeline change.
|
||||||
*/
|
*/
|
||||||
default void onTimelineChanged(
|
default void onTimelineChanged(
|
||||||
Timeline timeline, Object manifest, @TimelineChangeReason int reason) {}
|
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when the available or selected tracks change.
|
* Called when the available or selected tracks change.
|
||||||
@ -340,15 +340,15 @@ public interface Player {
|
|||||||
abstract class DefaultEventListener implements EventListener {
|
abstract class DefaultEventListener implements EventListener {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest,
|
public void onTimelineChanged(
|
||||||
@TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
|
||||||
// Call deprecated version. Otherwise, do nothing.
|
// Call deprecated version. Otherwise, do nothing.
|
||||||
onTimelineChanged(timeline, manifest);
|
onTimelineChanged(timeline, manifest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @deprecated Use {@link EventListener#onTimelineChanged(Timeline, Object, int)} instead. */
|
/** @deprecated Use {@link EventListener#onTimelineChanged(Timeline, Object, int)} instead. */
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest) {
|
public void onTimelineChanged(Timeline timeline, @Nullable Object manifest) {
|
||||||
// Do nothing.
|
// Do nothing.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -432,7 +432,7 @@ public class AnalyticsCollector
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final void onTimelineChanged(
|
public final void onTimelineChanged(
|
||||||
Timeline timeline, Object manifest, @Player.TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
|
||||||
mediaPeriodQueueTracker.onTimelineChanged(timeline);
|
mediaPeriodQueueTracker.onTimelineChanged(timeline);
|
||||||
EventTime eventTime = generatePlayingMediaPeriodEventTime();
|
EventTime eventTime = generatePlayingMediaPeriodEventTime();
|
||||||
for (AnalyticsListener listener : listeners) {
|
for (AnalyticsListener listener : listeners) {
|
||||||
|
@ -2186,7 +2186,7 @@ public final class ExoPlayerTest {
|
|||||||
final EventListener eventListener =
|
final EventListener eventListener =
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {
|
public void onTimelineChanged(Timeline timeline, @Nullable Object manifest, int reason) {
|
||||||
if (timeline.isEmpty()) {
|
if (timeline.isEmpty()) {
|
||||||
playerReference.get().setPlayWhenReady(/* playWhenReady= */ false);
|
playerReference.get().setPlayWhenReady(/* playWhenReady= */ false);
|
||||||
}
|
}
|
||||||
|
@ -1090,7 +1090,7 @@ public class PlayerControlView extends FrameLayout {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(
|
public void onTimelineChanged(
|
||||||
Timeline timeline, Object manifest, @Player.TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
|
||||||
updateNavigation();
|
updateNavigation();
|
||||||
updateTimeBarMode();
|
updateTimeBarMode();
|
||||||
updateProgress();
|
updateProgress();
|
||||||
|
@ -953,7 +953,7 @@ public class PlayerNotificationManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {
|
public void onTimelineChanged(Timeline timeline, @Nullable Object manifest, int reason) {
|
||||||
if (player == null || player.getPlaybackState() == Player.STATE_IDLE) {
|
if (player == null || player.getPlaybackState() == Player.STATE_IDLE) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -575,7 +575,9 @@ public abstract class Action {
|
|||||||
new Player.EventListener() {
|
new Player.EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(
|
public void onTimelineChanged(
|
||||||
Timeline timeline, Object manifest, @Player.TimelineChangeReason int reason) {
|
Timeline timeline,
|
||||||
|
@Nullable Object manifest,
|
||||||
|
@Player.TimelineChangeReason int reason) {
|
||||||
if (expectedTimeline == null || timeline.equals(expectedTimeline)) {
|
if (expectedTimeline == null || timeline.equals(expectedTimeline)) {
|
||||||
player.removeListener(this);
|
player.removeListener(this);
|
||||||
nextAction.schedule(player, trackSelector, surface, handler);
|
nextAction.schedule(player, trackSelector, surface, handler);
|
||||||
|
@ -608,8 +608,8 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
|
|||||||
// Player.EventListener
|
// Player.EventListener
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTimelineChanged(Timeline timeline, Object manifest,
|
public void onTimelineChanged(
|
||||||
@Player.TimelineChangeReason int reason) {
|
Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
|
||||||
timelines.add(timeline);
|
timelines.add(timeline);
|
||||||
manifests.add(manifest);
|
manifests.add(manifest);
|
||||||
timelineChangeReasons.add(reason);
|
timelineChangeReasons.add(reason);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user