loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-10 09:12:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix StyledPlayerView detachment

Browse Source 
Issue: #8985
#minor-release
PiperOrigin-RevId: 375913914
This commit is contained in:
olly 2021-05-26 12:34:36 +01:00 committed by Oliver Woodman
parent f49c14479e
commit 68eb7eb8df
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASENOTES.md
View File

@ -19,6 +19,10 @@
* Keep subtitle language features embedded (e.g. rubies & tate-chu-yoko) * Keep subtitle language features embedded (e.g. rubies & tate-chu-yoko)
in `Cue.text` even when `SubtitleView#setApplyEmbeddedStyles()` is in `Cue.text` even when `SubtitleView#setApplyEmbeddedStyles()` is
false. false.
* UI
* Fix `NullPointerException` in `StyledPlayerView` that could occur after
calling `StyledPlayerView.setPlayer(null)`
([#8985](https://github.com/google/ExoPlayer/issues/8985)).
### 2.14.0 (2021-05-13) ### 2.14.0 (2021-05-13)

1
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
View File

@ -570,6 +570,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
} }
@Nullable Player oldPlayer = this.player; @Nullable Player oldPlayer = this.player;
if (oldPlayer != null) { if (oldPlayer != null) {
oldPlayer.removeListener(componentListener);
if (surfaceView instanceof TextureView) { if (surfaceView instanceof TextureView) {
oldPlayer.clearVideoTextureView((TextureView) surfaceView); oldPlayer.clearVideoTextureView((TextureView) surfaceView);
} else if (surfaceView instanceof SurfaceView) { } else if (surfaceView instanceof SurfaceView) {