From 299487c17512c83f05d0aace1e6c1657c03ccd29 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phhusson@gmail.com>
Date: Tue, 26 Nov 2019 16:03:11 +0100
Subject: [PATCH] Accept setting null override to setSelectionOverride

In-code documentation say this is allowed, and is the expected way to
disable renderer.
---
 .../android/exoplayer2/trackselection/DefaultTrackSelector.java | 2 +-
 1 file changed, 1 insertion(+), 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 0d74652408..b315ea08a7 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
@@ -646,7 +646,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * @return This builder.
      */
     public final ParametersBuilder setSelectionOverride(
-        int rendererIndex, TrackGroupArray groups, SelectionOverride override) {
+        int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
       Map<TrackGroupArray, SelectionOverride> overrides = selectionOverrides.get(rendererIndex);
       if (overrides == null) {
         overrides = new HashMap<>();