Internal Cleanup

PiperOrigin-RevId: 607117264
2024-02-14 15:03:25 -08:00 · 2024-02-14 15:03:25 -08:00 · 8e2869278c
commit 8e2869278c
parent a0727fe4d7
18 changed files with 4 additions and 24 deletions
--- 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
--- 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"
--- 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">
--- 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"
--- 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
--- 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"
--- 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">
--- 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">
--- 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"/>
--- 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"/>

--- 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"/>

--- 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"/>

--- 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"/>
--- 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"
--- 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"/>
--- 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"
--- 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" >
--- 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" />