Skip to content

SDK / exoplayer

Go to a project
Commit ed18be4e by eguven Committed by Oliver Woodman
Options

Add missing Nullable annotation Player.EventListener.onTimelineChanged 

Issue: #4593

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=206911927
parent a3e3f64b
Inline Side-by-side
Showing with 22 additions and 18 deletions
demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.castdemo; ...@@ -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;
...@@ -282,7 +283,7 @@ import java.util.ArrayList; ...@@ -282,7 +283,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;
......
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
...@@ -795,8 +795,8 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A ...@@ -795,8 +795,8 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A
// 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;
......
extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
...@@ -281,8 +281,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter { ...@@ -281,8 +281,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter {
} }
@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);
......
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
...@@ -674,8 +674,8 @@ public final class MediaSessionConnector { ...@@ -674,8 +674,8 @@ public final class MediaSessionConnector {
private int currentWindowCount; private int currentWindowCount;
@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) {
int windowCount = player.getCurrentTimeline().getWindowCount(); int windowCount = player.getCurrentTimeline().getWindowCount();
int windowIndex = player.getCurrentWindowIndex(); int windowIndex = player.getCurrentWindowIndex();
if (queueNavigator != null) { if (queueNavigator != null) {
......
library/core/src/main/java/com/google/android/exoplayer2/Player.java
...@@ -191,7 +191,8 @@ public interface Player { ...@@ -191,7 +191,8 @@ public interface Player {
* @param manifest The latest manifest. May be null. * @param manifest The latest manifest. May be null.
* @param reason The {@link TimelineChangeReason} responsible for this timeline change. * @param reason The {@link TimelineChangeReason} responsible for this timeline change.
*/ */
void onTimelineChanged(Timeline timeline, Object manifest, @TimelineChangeReason int reason); void onTimelineChanged(
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason);
/** /**
* Called when the available or selected tracks change. * Called when the available or selected tracks change.
...@@ -281,8 +282,8 @@ public interface Player { ...@@ -281,8 +282,8 @@ 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);
} }
...@@ -337,7 +338,7 @@ public interface Player { ...@@ -337,7 +338,7 @@ public interface Player {
* instead. * instead.
*/ */
@Deprecated @Deprecated
public void onTimelineChanged(Timeline timeline, Object manifest) { public void onTimelineChanged(Timeline timeline, @Nullable Object manifest) {
// Do nothing. // Do nothing.
} }
......
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
...@@ -420,7 +420,7 @@ public class AnalyticsCollector ...@@ -420,7 +420,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) {
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -2078,7 +2078,7 @@ public final class ExoPlayerTest { ...@@ -2078,7 +2078,7 @@ public final class ExoPlayerTest {
final EventListener eventListener = final EventListener eventListener =
new DefaultEventListener() { new DefaultEventListener() {
@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);
} }
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
...@@ -1088,7 +1088,7 @@ public class PlayerControlView extends FrameLayout { ...@@ -1088,7 +1088,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();
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
...@@ -949,7 +949,7 @@ public class PlayerNotificationManager { ...@@ -949,7 +949,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;
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
...@@ -575,7 +575,9 @@ public abstract class Action { ...@@ -575,7 +575,9 @@ public abstract class Action {
new Player.DefaultEventListener() { new Player.DefaultEventListener() {
@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);
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
...@@ -601,8 +601,8 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener ...@@ -601,8 +601,8 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener
// 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);
......
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