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
4e851849
authored
Jun 04, 2021
by
aquilescanta
Committed by
bachinger
Jun 08, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make PlayerView depend on PlaybackException
PiperOrigin-RevId: 377542206
parent
95c0c5ca
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View file @
4e851849
...
@@ -47,8 +47,8 @@ import androidx.annotation.RequiresApi;
...
@@ -47,8 +47,8 @@ import androidx.annotation.RequiresApi;
import
androidx.core.content.ContextCompat
;
import
androidx.core.content.ContextCompat
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.ControlDispatcher
;
import
com.google.android.exoplayer2.ControlDispatcher
;
import
com.google.android.exoplayer2.ExoPlaybackException
;
import
com.google.android.exoplayer2.Format
;
import
com.google.android.exoplayer2.Format
;
import
com.google.android.exoplayer2.PlaybackException
;
import
com.google.android.exoplayer2.Player
;
import
com.google.android.exoplayer2.Player
;
import
com.google.android.exoplayer2.Player.DiscontinuityReason
;
import
com.google.android.exoplayer2.Player.DiscontinuityReason
;
import
com.google.android.exoplayer2.Timeline
;
import
com.google.android.exoplayer2.Timeline
;
...
@@ -305,7 +305,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
...
@@ -305,7 +305,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
@Nullable
private
Drawable
defaultArtwork
;
@Nullable
private
Drawable
defaultArtwork
;
private
@ShowBuffering
int
showBuffering
;
private
@ShowBuffering
int
showBuffering
;
private
boolean
keepContentOnPlayerReset
;
private
boolean
keepContentOnPlayerReset
;
@Nullable
private
ErrorMessageProvider
<?
super
Exo
PlaybackException
>
errorMessageProvider
;
@Nullable
private
ErrorMessageProvider
<?
super
PlaybackException
>
errorMessageProvider
;
@Nullable
private
CharSequence
customErrorMessage
;
@Nullable
private
CharSequence
customErrorMessage
;
private
int
controllerShowTimeoutMs
;
private
int
controllerShowTimeoutMs
;
private
boolean
controllerAutoShow
;
private
boolean
controllerAutoShow
;
...
@@ -754,7 +754,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
...
@@ -754,7 +754,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
* @param errorMessageProvider The error message provider.
* @param errorMessageProvider The error message provider.
*/
*/
public
void
setErrorMessageProvider
(
public
void
setErrorMessageProvider
(
@Nullable
ErrorMessageProvider
<?
super
Exo
PlaybackException
>
errorMessageProvider
)
{
@Nullable
ErrorMessageProvider
<?
super
PlaybackException
>
errorMessageProvider
)
{
if
(
this
.
errorMessageProvider
!=
errorMessageProvider
)
{
if
(
this
.
errorMessageProvider
!=
errorMessageProvider
)
{
this
.
errorMessageProvider
=
errorMessageProvider
;
this
.
errorMessageProvider
=
errorMessageProvider
;
updateErrorMessage
();
updateErrorMessage
();
...
@@ -1373,7 +1373,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
...
@@ -1373,7 +1373,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
errorMessageView
.
setVisibility
(
View
.
VISIBLE
);
errorMessageView
.
setVisibility
(
View
.
VISIBLE
);
return
;
return
;
}
}
@Nullable
Exo
PlaybackException
error
=
player
!=
null
?
player
.
getPlayerError
()
:
null
;
@Nullable
PlaybackException
error
=
player
!=
null
?
player
.
getPlayerError
()
:
null
;
if
(
error
!=
null
&&
errorMessageProvider
!=
null
)
{
if
(
error
!=
null
&&
errorMessageProvider
!=
null
)
{
CharSequence
errorMessage
=
errorMessageProvider
.
getErrorMessage
(
error
).
second
;
CharSequence
errorMessage
=
errorMessageProvider
.
getErrorMessage
(
error
).
second
;
errorMessageView
.
setText
(
errorMessage
);
errorMessageView
.
setText
(
errorMessage
);
...
...
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