From 8e2869278c1beb1f908362dbd788466a7c3b33b4 Mon Sep 17 00:00:00 2001
From: asinclair <asinclair@google.com>
Date: Wed, 14 Feb 2024 15:03:25 -0800
Subject: [PATCH] Internal Cleanup

PiperOrigin-RevId: 607117264
---
 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, 4 insertions(+), 24 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index f0e982817d..c53dff5e49 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 = 19
+    minSdkVersion = 21
     // 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 b6a9b56eac..e852ca39fa 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <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 d44f8ea343..d4d79a7053 100644
--- a/demos/gl/src/main/AndroidManifest.xml
+++ b/demos/gl/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <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 da13a42ca4..1a3dff3102 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -40,7 +40,6 @@
       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 d902b7f414..1356e55688 100644
--- a/demos/session/src/main/AndroidManifest.xml
+++ b/demos/session/src/main/AndroidManifest.xml
@@ -23,12 +23,10 @@
   <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"
-      tools:replace="android:name">
+      android:theme="@style/Theme.Media3Demo">
 
     <!-- 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 a35fbb4e2e..635fc943fb 100644
--- a/demos/session_automotive/src/main/AndroidManifest.xml
+++ b/demos/session_automotive/src/main/AndroidManifest.xml
@@ -39,13 +39,11 @@
     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"
-      tools:replace="android:name">
+      android:label="@string/app_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 a1d03af062..aaba823725 100644
--- a/demos/shortform/src/main/AndroidManifest.xml
+++ b/demos/shortform/src/main/AndroidManifest.xml
@@ -21,10 +21,8 @@
     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=""
-    tools:replace="android:name">
+    android:taskAffinity="">
     <activity
       android:exported="true"
       android:name=".MainActivity">
diff --git a/libraries/datasource/src/androidTest/AndroidManifest.xml b/libraries/datasource/src/androidTest/AndroidManifest.xml
index afcbb337b5..32373d1c2a 100644
--- a/libraries/datasource/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <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 fd7a6dcc79..7da3a987c1 100644
--- a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <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 d28b481540..1451696625 100644
--- a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <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 ab27436543..b6ed01f150 100644
--- a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <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 b22a45dedd..818d5196fc 100644
--- a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <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 cee0ce28ad..b1fb1cf643 100644
--- a/libraries/exoplayer/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <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 986dce0394..0b0db6b46a 100644
--- a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
   <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 6339266515..d5e5195cd3 100644
--- a/libraries/extractor/src/androidTest/AndroidManifest.xml
+++ b/libraries/extractor/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,6 @@
   <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 2374319ed6..a0d2fd0cfe 100644
--- a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
   <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 e2263fbec1..ffdbb11f5b 100644
--- a/libraries/test_session_current/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_session_current/src/androidTest/AndroidManifest.xml
@@ -19,7 +19,6 @@
   <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 a2f3235416..2376fb871e 100644
--- a/libraries/test_session_current/src/main/AndroidManifest.xml
+++ b/libraries/test_session_current/src/main/AndroidManifest.xml
@@ -24,7 +24,6 @@
   </queries>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false">
     <activity android:name="androidx.media3.test.session.common.SurfaceActivity"
         android:exported="false" />