sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Defensively copy potentially mutable text in Cue constructor

Browse source 
Without this the Cue isn't deeply immutable, which can be a bit
surprising.

PiperOrigin-RevId: 375477571
This commit is contained in:
ibaker 2021-05-24 16:11:06 +01:00 committed by Oliver Woodman
parent b87a4c04e0
commit 55f50e24eb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/common/src/main/java/com/google/android/exoplayer2/text/Cue.java
View file

@ -19,6 +19,8 @@ import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.text.Layout; import android.text.Layout;
import android.text.Layout.Alignment; import android.text.Layout.Alignment;
import android.text.Spanned;
import android.text.SpannedString;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -458,7 +460,13 @@ public final class Cue {
} else { } else {
Assertions.checkArgument(bitmap == null); Assertions.checkArgument(bitmap == null);
} }
this.text = text; if (text instanceof Spanned) {
this.text = SpannedString.valueOf(text);
} else if (text != null) {
this.text = text.toString();
} else {
this.text = null;
}
this.textAlignment = textAlignment; this.textAlignment = textAlignment;
this.multiRowAlignment = multiRowAlignment; this.multiRowAlignment = multiRowAlignment;
this.bitmap = bitmap; this.bitmap = bitmap;