refactor

yuliskov · Aug 28, 2024 · 9d6a9dd · 9d6a9dd
1 parent fd72dae
commit 9d6a9dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/exoplayer-amzn-2.10.6/library/core/build.gradle b/exoplayer-amzn-2.10.6/library/core/build.gradle
@@ -61,7 +61,6 @@ android {
 dependencies {
     // MODIFIED: add custom dns resolver
     implementation project(':sharedutils')
-    implementation 'androidx.core:core:' + coreXLibraryVersion
     implementation 'androidx.annotation:annotation:' + annotationXLibraryVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion

diff --git a/...library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/...library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
@@ -17,8 +17,8 @@
 
 import android.graphics.Typeface;
 import androidx.annotation.NonNull;
-import androidx.core.text.HtmlCompat;
 
+import android.text.Html;
 import android.text.Layout.Alignment;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
@@ -160,7 +160,7 @@ public boolean parseCue(ParsableByteArray webvttData, WebvttCue.Builder builder,
   /* package */ static void parseCueText(String id, String markup, WebvttCue.Builder builder,
       List<WebvttCssStyle> styles) {
     // MOD: Fix embedded styles by decoding html entities
-    markup = HtmlCompat.fromHtml(markup, HtmlCompat.FROM_HTML_MODE_LEGACY).toString();
+    markup = Html.fromHtml(markup).toString();
 
     SpannableStringBuilder spannedText = new SpannableStringBuilder();
     ArrayDeque<StartTag> startTagStack = new ArrayDeque<>();