Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c02933ac
authored
Feb 09, 2020
by
bachinger
Committed by
kim-vde
Feb 11, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
rename getPlaybackError
PiperOrigin-RevId: 294074348
parent
ecc04b2b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
36 additions
and
3 deletions
RELEASENOTES.md
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
library/core/src/main/java/com/google/android/exoplayer2/Player.java
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
RELEASENOTES.md
View file @
c02933ac
...
...
@@ -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
...
...
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
View file @
c02933ac
...
...
@@ -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
;
}
...
...
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
View file @
c02933ac
...
...
@@ -752,7 +752,7 @@ public final class MediaSessionConnector {
customActionMap
=
Collections
.
unmodifiableMap
(
currentActions
);
Bundle
extras
=
new
Bundle
();
@Nullable
ExoPlaybackException
playbackError
=
player
.
getPlay
back
Error
();
@Nullable
ExoPlaybackException
playbackError
=
player
.
getPlay
er
Error
();
boolean
reportError
=
playbackError
!=
null
||
customError
!=
null
;
int
sessionPlaybackState
=
reportError
...
...
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View file @
c02933ac
...
...
@@ -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
;
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/Player.java
View file @
c02933ac
...
...
@@ -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
();
/**
...
...
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View file @
c02933ac
...
...
@@ -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
.
getPlay
back
Error
();
return
player
.
getPlay
er
Error
();
}
/** @deprecated Use {@link #prepare()} instead. */
...
...
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View file @
c02933ac
...
...
@@ -1393,7 +1393,7 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
errorMessageView
.
setVisibility
(
View
.
VISIBLE
);
return
;
}
@Nullable
ExoPlaybackException
error
=
player
!=
null
?
player
.
getPlay
back
Error
()
:
null
;
@Nullable
ExoPlaybackException
error
=
player
!=
null
?
player
.
getPlay
er
Error
()
:
null
;
if
(
error
!=
null
&&
errorMessageProvider
!=
null
)
{
CharSequence
errorMessage
=
errorMessageProvider
.
getErrorMessage
(
error
).
second
;
errorMessageView
.
setText
(
errorMessage
);
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
View file @
c02933ac
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment