From dcd549bd3e689e54d953c8b49cbd1b25bb7127b4 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 23 Jul 2018 14:06:29 +0100
Subject: [PATCH] Fix release branch

---
 .../android/exoplayer2/trackselection/DefaultTrackSelector.java | 2 +-
 .../java/com/google/android/exoplayer2/ui/SubtitlePainter.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 31b79cdd3f..0067ffa552 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -661,7 +661,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     private Parameters() {
       this(
-          /* selectionOverrides= */ new SparseArray<>(),
+          /* selectionOverrides= */ new SparseArray<Map<TrackGroupArray,SelectionOverride>>(),
           /* rendererDisabledFlags= */ new SparseBooleanArray(),
           /* preferredAudioLanguage= */ null,
           /* preferredTextLanguage= */ null,
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
index 3ad3e9d496..687cd78004 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
@@ -28,6 +28,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.text.Layout.Alignment;
 import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;