From ed18be4eea1edc7cc23a05d447768373385299f7 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 --- .../android/exoplayer2/castdemo/PlayerManager.java | 3 ++- .../google/android/exoplayer2/ext/ima/ImaAdsLoader.java | 4 ++-- .../exoplayer2/ext/leanback/LeanbackPlayerAdapter.java | 4 ++-- .../ext/mediasession/MediaSessionConnector.java | 4 ++-- .../main/java/com/google/android/exoplayer2/Player.java | 9 +++++---- .../android/exoplayer2/analytics/AnalyticsCollector.java | 2 +- .../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, 22 insertions(+), 18 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 63b18b0aa7..6c8d7a294f 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; @@ -282,7 +283,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 cce45f2d2c..dc2df9eb71 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 @@ -795,8 +795,8 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A // 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 03f53c263f..a279874ec1 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 @@ -281,8 +281,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter { } @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 4bafaa4326..039115174c 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 @@ -674,8 +674,8 @@ public final class MediaSessionConnector { private int currentWindowCount; @Override - public void onTimelineChanged(Timeline timeline, Object manifest, - @Player.TimelineChangeReason int reason) { + public void onTimelineChanged( + 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 328816d709..8501f5b827 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 @@ -191,7 +191,8 @@ public interface Player { * @param manifest The latest manifest. May be null. * @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. @@ -281,8 +282,8 @@ 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); } @@ -337,7 +338,7 @@ public interface Player { * 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 8f4267efce..16c1c5d170 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 @@ -420,7 +420,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 559a915b2b..44f6f2aa82 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 @@ -2078,7 +2078,7 @@ public final class ExoPlayerTest { final EventListener eventListener = new DefaultEventListener() { @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 63c791d166..d673f3675b 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 @@ -1088,7 +1088,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 19051ba932..e64d03e0bf 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 @@ -949,7 +949,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 a6c3438a52..1d9ccf4b50 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.DefaultEventListener() { @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 cf7470b80a..101f2c4817 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 @@ -601,8 +601,8 @@ public final class ExoPlayerTestRunner extends Player.DefaultEventListener // 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);