Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/media/java/android/media/WebVttRenderer.java b/media/java/android/media/WebVttRenderer.java
index 74773a8be437..edde68d7ee16 100644
--- a/media/java/android/media/WebVttRenderer.java
+++ b/media/java/android/media/WebVttRenderer.java
@@ -690,6 +690,9 @@ class WebVttParser {
     final private Phase mParseStart = new Phase() { // 5-9
         @Override
         public void parse(String line) {
+            if (line.startsWith("\ufeff")) {
+                line = line.substring(1);
+            }
             if (!line.equals("WEBVTT") &&
                     !line.startsWith("WEBVTT ") &&
                     !line.startsWith("WEBVTT\t")) {