From c14b250445231fb58b254d60fa9b08f33e5272b4 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Fri, 2 Dec 2022 23:55:10 +0000
Subject: [PATCH] Temporal fix to allow proper library shrinking.

PiperOrigin-RevId: 492579961
---
 .../media3/extractor/DefaultExtractorsFactory.java         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/DefaultExtractorsFactory.java b/libraries/extractor/src/main/java/androidx/media3/extractor/DefaultExtractorsFactory.java
index 13a35994b5..85b2206cf4 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/DefaultExtractorsFactory.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/DefaultExtractorsFactory.java
@@ -130,13 +130,13 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
   private @Mp3Extractor.Flags int mp3Flags;
   private @TsExtractor.Mode int tsMode;
   private @DefaultTsPayloadReaderFactory.Flags int tsFlags;
-  private ImmutableList<Format> tsSubtitleFormats;
+  // TODO (b/260245332): Initialize tsSubtitleFormats in constructor once shrinking bug is fixed.
+  @Nullable private ImmutableList<Format> tsSubtitleFormats;
   private int tsTimestampSearchBytes;
 
   public DefaultExtractorsFactory() {
     tsMode = TsExtractor.MODE_SINGLE_PMT;
     tsTimestampSearchBytes = TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES;
-    tsSubtitleFormats = ImmutableList.of();
   }
 
   /**
@@ -434,6 +434,9 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
         extractors.add(new PsExtractor());
         break;
       case FileTypes.TS:
+        if (tsSubtitleFormats == null) {
+          tsSubtitleFormats = ImmutableList.of();
+        }
         extractors.add(
             new TsExtractor(
                 tsMode,