loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure we destroy WebViews when we detach them from SubtitleView

Browse Source 
PiperOrigin-RevId: 309389731
This commit is contained in:
ibaker 2020-05-01 12:37:29 +01:00 committed by Oliver Woodman
parent 79c003f5a8
commit 10db7a9c45
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
View File

@ -143,6 +143,9 @@ public final class SubtitleView extends FrameLayout implements TextOutput {
private <T extends View & Output> void setView(T view) { private <T extends View & Output> void setView(T view) {
removeView(innerSubtitleView); removeView(innerSubtitleView);
if (innerSubtitleView instanceof SubtitleWebView) {
((SubtitleWebView) innerSubtitleView).destroy();
}
innerSubtitleView = view; innerSubtitleView = view;
output = view; output = view;
addView(view); addView(view);

11
library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleWebView.java
View File

@ -174,6 +174,17 @@ import java.util.List;
updateWebView(); updateWebView();
} }
/**
* Cleans up internal state, including calling {@link WebView#destroy()} on the delegate view.
*
* <p>This method may only be called after this view has been removed from the view system. No
* other methods may be called on this view after destroy.
*/
public void destroy() {
cues.clear();
webView.destroy();
}
private void updateWebView() { private void updateWebView() {
StringBuilder html = new StringBuilder(); StringBuilder html = new StringBuilder();
html.append( html.append(