From c02933ac0a891b675082a1721cbb76c667ea1a15 Mon Sep 17 00:00:00 2001 From: bachinger Date: Sun, 9 Feb 2020 12:37:48 +0000 Subject: [PATCH] rename getPlaybackError PiperOrigin-RevId: 294074348 --- RELEASENOTES.md | 1 + .../google/android/exoplayer2/ext/cast/CastPlayer.java | 7 +++++++ .../ext/mediasession/MediaSessionConnector.java | 2 +- .../com/google/android/exoplayer2/ExoPlayerImpl.java | 7 +++++++ .../main/java/com/google/android/exoplayer2/Player.java | 5 +++++ .../com/google/android/exoplayer2/SimpleExoPlayer.java | 9 ++++++++- .../com/google/android/exoplayer2/ui/PlayerView.java | 2 +- .../android/exoplayer2/testutil/StubExoPlayer.java | 6 ++++++ 8 files changed, 36 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a0249190c7..d2b6d85b98 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -9,6 +9,7 @@ * Add `Player.onPlayWhenReadyChanged` with reasons. * Add `Player.onPlaybackStateChanged` and deprecate `Player.onPlayerStateChanged`. + * Deprecate and rename getPlaybackError to getPlayerError for consistency. * Make `MediaSourceEventListener.LoadEventInfo` and `MediaSourceEventListener.MediaLoadData` top-level classes. * Rename `MediaCodecRenderer.onOutputFormatChanged` to diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java index bb3f80b9cf..fa63599701 100644 --- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java +++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java @@ -337,9 +337,16 @@ public final class CastPlayer extends BasePlayer { return Player.PLAYBACK_SUPPRESSION_REASON_NONE; } + @Deprecated @Override @Nullable public ExoPlaybackException getPlaybackError() { + return getPlayerError(); + } + + @Override + @Nullable + public ExoPlaybackException getPlayerError() { return null; } 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 0853de4b61..3476b12573 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 @@ -752,7 +752,7 @@ public final class MediaSessionConnector { customActionMap = Collections.unmodifiableMap(currentActions); Bundle extras = new Bundle(); - @Nullable ExoPlaybackException playbackError = player.getPlaybackError(); + @Nullable ExoPlaybackException playbackError = player.getPlayerError(); boolean reportError = playbackError != null || customError != null; int sessionPlaybackState = reportError diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 6b216297af..947562f79d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -240,9 +240,16 @@ import java.util.concurrent.TimeoutException; return playbackSuppressionReason; } + @Deprecated @Override @Nullable public ExoPlaybackException getPlaybackError() { + return getPlayerError(); + } + + @Override + @Nullable + public ExoPlaybackException getPlayerError() { return playbackInfo.playbackError; } 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 98d4b8ab21..f2c36e0992 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 @@ -755,6 +755,11 @@ public interface Player { * @return The error, or {@code null}. */ @Nullable + ExoPlaybackException getPlayerError(); + + /** @deprecated Use {@link #getPlayerError()} instead. */ + @Deprecated + @Nullable ExoPlaybackException getPlaybackError(); /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index d3c7d66d28..fe54478fde 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -1163,11 +1163,18 @@ public class SimpleExoPlayer extends BasePlayer return player.getPlaybackSuppressionReason(); } + @Deprecated @Override @Nullable public ExoPlaybackException getPlaybackError() { + return getPlayerError(); + } + + @Override + @Nullable + public ExoPlaybackException getPlayerError() { verifyApplicationThread(); - return player.getPlaybackError(); + return player.getPlayerError(); } /** @deprecated Use {@link #prepare()} instead. */ diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java index 8ae9492441..b7c695603b 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java @@ -1393,7 +1393,7 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider errorMessageView.setVisibility(View.VISIBLE); return; } - @Nullable ExoPlaybackException error = player != null ? player.getPlaybackError() : null; + @Nullable ExoPlaybackException error = player != null ? player.getPlayerError() : null; if (error != null && errorMessageProvider != null) { CharSequence errorMessage = errorMessageProvider.getErrorMessage(error).second; errorMessageView.setText(errorMessage); diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java index 12f1ed55cf..f8488155b5 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java @@ -89,11 +89,17 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer { throw new UnsupportedOperationException(); } + @Deprecated @Override public ExoPlaybackException getPlaybackError() { throw new UnsupportedOperationException(); } + @Override + public ExoPlaybackException getPlayerError() { + throw new UnsupportedOperationException(); + } + /** @deprecated Use {@link #prepare()} instead. */ @Deprecated @Override