From 45c1e9eef3dac7b04a064b1eb8c6f3a3305bdeae Mon Sep 17 00:00:00 2001 From: eguven Date: Wed, 1 Aug 2018 04:32:11 -0700 Subject: [PATCH] Add missing Nullable annotation Player.EventListener.onTimelineChanged Issue: #4593 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=206911927 --- .../google/android/exoplayer2/castdemo/PlayerManager.java | 3 ++- .../google/android/exoplayer2/ext/ima/ImaAdsLoader.java | 4 ++-- .../exoplayer2/ext/leanback/LeanbackPlayerAdapter.java | 4 ++-- .../ext/mediasession/MediaSessionConnector.java | 2 +- .../main/java/com/google/android/exoplayer2/Player.java | 8 ++++---- .../android/exoplayer2/analytics/AnalyticsCollector.java | 2 +- .../java/com/google/android/exoplayer2/ExoPlayerTest.java | 2 +- .../google/android/exoplayer2/ui/PlayerControlView.java | 2 +- .../android/exoplayer2/ui/PlayerNotificationManager.java | 2 +- .../com/google/android/exoplayer2/testutil/Action.java | 4 +++- .../android/exoplayer2/testutil/ExoPlayerTestRunner.java | 4 ++-- 11 files changed, 20 insertions(+), 17 deletions(-) diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java index eb7e34c103..d188469de8 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.castdemo; import android.content.Context; import android.net.Uri; +import android.support.annotation.Nullable; import android.view.KeyEvent; import android.view.View; import com.google.android.exoplayer2.C; @@ -276,7 +277,7 @@ import java.util.ArrayList; @Override public void onTimelineChanged( - Timeline timeline, Object manifest, @TimelineChangeReason int reason) { + Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) { updateCurrentItemIndex(); if (timeline.isEmpty()) { castMediaQueueCreationPending = true; diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java index 1f646982b7..87ee52502e 100644 --- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java +++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java @@ -837,8 +837,8 @@ public final class ImaAdsLoader // Player.EventListener implementation. @Override - public void onTimelineChanged(Timeline timeline, Object manifest, - @Player.TimelineChangeReason int reason) { + public void onTimelineChanged( + Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) { if (reason == Player.TIMELINE_CHANGE_REASON_RESET) { // The player is being reset and this source will be released. return; diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java index 73bea20849..0c9491bb1a 100644 --- a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java +++ b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java @@ -288,8 +288,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab } @Override - public void onTimelineChanged(Timeline timeline, Object manifest, - @TimelineChangeReason int reason) { + public void onTimelineChanged( + Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) { Callback callback = getCallback(); callback.onDurationChanged(LeanbackPlayerAdapter.this); callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this); diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java index 9b39a0415e..c3d6a13f46 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java @@ -774,7 +774,7 @@ public final class MediaSessionConnector { @Override 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 windowIndex = player.getCurrentWindowIndex(); if (queueNavigator != null) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java index 589fde6a2a..b2313e6085 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java @@ -248,7 +248,7 @@ public interface Player { * @param reason The {@link TimelineChangeReason} responsible for this timeline change. */ 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. @@ -340,15 +340,15 @@ public interface Player { abstract class DefaultEventListener implements EventListener { @Override - public void onTimelineChanged(Timeline timeline, Object manifest, - @TimelineChangeReason int reason) { + public void onTimelineChanged( + Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) { // Call deprecated version. Otherwise, do nothing. onTimelineChanged(timeline, manifest); } /** @deprecated Use {@link EventListener#onTimelineChanged(Timeline, Object, int)} instead. */ @Deprecated - public void onTimelineChanged(Timeline timeline, Object manifest) { + public void onTimelineChanged(Timeline timeline, @Nullable Object manifest) { // Do nothing. } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java index 3efe0a00cc..262187586b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java @@ -432,7 +432,7 @@ public class AnalyticsCollector @Override public final void onTimelineChanged( - Timeline timeline, Object manifest, @Player.TimelineChangeReason int reason) { + Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) { mediaPeriodQueueTracker.onTimelineChanged(timeline); EventTime eventTime = generatePlayingMediaPeriodEventTime(); for (AnalyticsListener listener : listeners) { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java index 82b8a8d892..e28fdd18a3 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java @@ -2186,7 +2186,7 @@ public final class ExoPlayerTest { final EventListener eventListener = new EventListener() { @Override - public void onTimelineChanged(Timeline timeline, Object manifest, int reason) { + public void onTimelineChanged(Timeline timeline, @Nullable Object manifest, int reason) { if (timeline.isEmpty()) { playerReference.get().setPlayWhenReady(/* playWhenReady= */ false); } diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java index 150e6d1389..abe884ce53 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java @@ -1090,7 +1090,7 @@ public class PlayerControlView extends FrameLayout { @Override public void onTimelineChanged( - Timeline timeline, Object manifest, @Player.TimelineChangeReason int reason) { + Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) { updateNavigation(); updateTimeBarMode(); updateProgress(); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index 0cb817a551..f3edacaebc 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -953,7 +953,7 @@ public class PlayerNotificationManager { } @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) { return; } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java index 5b3ede1c42..a6f672e54d 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java @@ -575,7 +575,9 @@ public abstract class Action { new Player.EventListener() { @Override 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)) { player.removeListener(this); nextAction.schedule(player, trackSelector, surface, handler); diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java index c637792935..5ac071d9a2 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java @@ -608,8 +608,8 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc // Player.EventListener @Override - public void onTimelineChanged(Timeline timeline, Object manifest, - @Player.TimelineChangeReason int reason) { + public void onTimelineChanged( + Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) { timelines.add(timeline); manifests.add(manifest); timelineChangeReasons.add(reason);