From 3bd662eb9ac3f3c198f9cd348443e19b4b00c931 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 2 Jul 2021 18:09:18 +0100
Subject: [PATCH] Don't propagate attrs into child SubtitleOutput from
 SubtitleView

#minor-release

PiperOrigin-RevId: 382763308
---
 RELEASENOTES.md                                                | 3 +++
 .../java/com/google/android/exoplayer2/ui/SubtitleView.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0820d2b79d..a108714d80 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -69,6 +69,9 @@
     *   Fix `StyledPlayerView` and `StyledPlayerControlView` popup menu items
         not expanding to occupy the full width of the popup
         ([#9086](https://github.com/google/ExoPlayer/issues/9086)).
+    *   Don't propagate `AttributeSet` from `SubtitleView` constructor into
+        `CanvasSubtitleOutput`. Just passing the `Context` is enough, and
+        ensures programmatic changes to the `SubtitleView` will propagate down.
 *   Video:
     *   Fix `IncorrectContextUseViolation` strict mode warning on Android 11
         ([#8246](https://github.com/google/ExoPlayer/pull/8246)).
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
index 6c5b2b30b1..9731506ecd 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
@@ -140,7 +140,7 @@ public final class SubtitleView extends FrameLayout implements TextOutput {
     applyEmbeddedStyles = true;
     applyEmbeddedFontSizes = true;
 
-    CanvasSubtitleOutput canvasSubtitleOutput = new CanvasSubtitleOutput(context, attrs);
+    CanvasSubtitleOutput canvasSubtitleOutput = new CanvasSubtitleOutput(context);
     output = canvasSubtitleOutput;
     innerSubtitleView = canvasSubtitleOutput;
     addView(innerSubtitleView);