From 4777d62d31c7b60297c9ee1d44d8ba9810bd305a Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 15 Feb 2024 02:32:33 -0800
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/8e2869278c1beb1f908362dbd788466a7c3b33b4

PiperOrigin-RevId: 607264513
---
 constants.gradle                                              | 2 +-
 demos/cast/src/main/AndroidManifest.xml                       | 1 +
 demos/gl/src/main/AndroidManifest.xml                         | 1 +
 demos/main/src/main/AndroidManifest.xml                       | 1 +
 demos/session/src/main/AndroidManifest.xml                    | 4 +++-
 demos/session_automotive/src/main/AndroidManifest.xml         | 4 +++-
 demos/shortform/src/main/AndroidManifest.xml                  | 4 +++-
 libraries/datasource/src/androidTest/AndroidManifest.xml      | 1 +
 .../datasource_cronet/src/androidTest/AndroidManifest.xml     | 1 +
 libraries/decoder_flac/src/androidTest/AndroidManifest.xml    | 1 +
 libraries/decoder_opus/src/androidTest/AndroidManifest.xml    | 1 +
 libraries/decoder_vp9/src/androidTest/AndroidManifest.xml     | 1 +
 libraries/exoplayer/src/androidTest/AndroidManifest.xml       | 1 +
 libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml   | 1 +
 libraries/extractor/src/androidTest/AndroidManifest.xml       | 1 +
 .../src/androidTest/AndroidManifest.xml                       | 1 +
 .../test_session_current/src/androidTest/AndroidManifest.xml  | 1 +
 libraries/test_session_current/src/main/AndroidManifest.xml   | 1 +
 18 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index c53dff5e49..f0e982817d 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -14,7 +14,7 @@
 project.ext {
     releaseVersion = '1.3.0-rc01'
     releaseVersionCode = 1_003_000_2_01
-    minSdkVersion = 21
+    minSdkVersion = 19
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28
     appTargetSdkVersion = 34
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index e852ca39fa..b6a9b56eac 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:label="@string/application_name"
       android:icon="@mipmap/ic_launcher"
       android:largeHeap="true"
diff --git a/demos/gl/src/main/AndroidManifest.xml b/demos/gl/src/main/AndroidManifest.xml
index d4d79a7053..d44f8ea343 100644
--- a/demos/gl/src/main/AndroidManifest.xml
+++ b/demos/gl/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/application_name">
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 1a3dff3102..da13a42ca4 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
       android:largeHeap="true"
       android:allowBackup="false"
       android:supportsRtl="true"
+      android:name="androidx.multidex.MultiDexApplication"
       tools:targetApi="29">
 
     <activity android:name=".SampleChooserActivity"
diff --git a/demos/session/src/main/AndroidManifest.xml b/demos/session/src/main/AndroidManifest.xml
index 1356e55688..d902b7f414 100644
--- a/demos/session/src/main/AndroidManifest.xml
+++ b/demos/session/src/main/AndroidManifest.xml
@@ -23,10 +23,12 @@
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
-      android:theme="@style/Theme.Media3Demo">
+      android:theme="@style/Theme.Media3Demo"
+      tools:replace="android:name">
 
     <!-- Declare that this session demo supports Android Auto. -->
     <meta-data
diff --git a/demos/session_automotive/src/main/AndroidManifest.xml b/demos/session_automotive/src/main/AndroidManifest.xml
index 635fc943fb..a35fbb4e2e 100644
--- a/demos/session_automotive/src/main/AndroidManifest.xml
+++ b/demos/session_automotive/src/main/AndroidManifest.xml
@@ -39,11 +39,13 @@
     android:resource="@xml/automotive_app_desc"/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:taskAffinity=""
       android:appCategory="audio"
       android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name">
+      android:label="@string/app_name"
+      tools:replace="android:name">
 
     <meta-data
       android:name="androidx.car.app.TintableAttributionIcon"
diff --git a/demos/shortform/src/main/AndroidManifest.xml b/demos/shortform/src/main/AndroidManifest.xml
index aaba823725..a1d03af062 100644
--- a/demos/shortform/src/main/AndroidManifest.xml
+++ b/demos/shortform/src/main/AndroidManifest.xml
@@ -21,8 +21,10 @@
     android:allowBackup="false"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
+    android:name="androidx.multidex.MultiDexApplication"
     android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
-    android:taskAffinity="">
+    android:taskAffinity=""
+    tools:replace="android:name">
     <activity
       android:exported="true"
       android:name=".MainActivity">
diff --git a/libraries/datasource/src/androidTest/AndroidManifest.xml b/libraries/datasource/src/androidTest/AndroidManifest.xml
index 32373d1c2a..afcbb337b5 100644
--- a/libraries/datasource/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource/src/androidTest/AndroidManifest.xml
@@ -23,6 +23,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:usesCleartextTraffic="true"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
index 7da3a987c1..fd7a6dcc79 100644
--- a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
@@ -23,6 +23,7 @@
   <uses-sdk/>
 
   <application
+    android:name="androidx.multidex.MultiDexApplication"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
diff --git a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
index 1451696625..d28b481540 100644
--- a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
@@ -22,6 +22,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
index b6ed01f150..ab27436543 100644
--- a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
@@ -22,6 +22,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
index 818d5196fc..b22a45dedd 100644
--- a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
@@ -22,6 +22,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/libraries/exoplayer/src/androidTest/AndroidManifest.xml b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
index b1fb1cf643..cee0ce28ad 100644
--- a/libraries/exoplayer/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
@@ -23,6 +23,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>
diff --git a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
index 0b0db6b46a..986dce0394 100644
--- a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="androidx.media3.test.utils.HostActivity"
diff --git a/libraries/extractor/src/androidTest/AndroidManifest.xml b/libraries/extractor/src/androidTest/AndroidManifest.xml
index d5e5195cd3..6339266515 100644
--- a/libraries/extractor/src/androidTest/AndroidManifest.xml
+++ b/libraries/extractor/src/androidTest/AndroidManifest.xml
@@ -21,6 +21,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>
diff --git a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
index a0d2fd0cfe..2374319ed6 100644
--- a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="androidx.media3.test.utils.HostActivity"
diff --git a/libraries/test_session_current/src/androidTest/AndroidManifest.xml b/libraries/test_session_current/src/androidTest/AndroidManifest.xml
index ffdbb11f5b..e2263fbec1 100644
--- a/libraries/test_session_current/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_session_current/src/androidTest/AndroidManifest.xml
@@ -19,6 +19,7 @@
   <uses-sdk />
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true" >
diff --git a/libraries/test_session_current/src/main/AndroidManifest.xml b/libraries/test_session_current/src/main/AndroidManifest.xml
index 2376fb871e..a2f3235416 100644
--- a/libraries/test_session_current/src/main/AndroidManifest.xml
+++ b/libraries/test_session_current/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
   </queries>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false">
     <activity android:name="androidx.media3.test.session.common.SurfaceActivity"
         android:exported="false" />