From 8c79a8fed24232195da172ae7a5063bb7cf31ece Mon Sep 17 00:00:00 2001
From: Ian Baker <ibaker@google.com>
Date: Thu, 25 Jul 2024 13:12:10 +0100
Subject: [PATCH] Remove tools:replace="android:name" from manifests where
 multidex config has been removed

---
 demos/session/src/main/AndroidManifest.xml            | 4 +---
 demos/session_automotive/src/main/AndroidManifest.xml | 4 +---
 demos/shortform/src/main/AndroidManifest.xml          | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/demos/session/src/main/AndroidManifest.xml b/demos/session/src/main/AndroidManifest.xml
index 95758b0efb..e6b8d37879 100644
--- a/demos/session/src/main/AndroidManifest.xml
+++ b/demos/session/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="androidx.media3.demo.session">
 
   <uses-sdk/>
@@ -26,8 +25,7 @@
       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 514547fc9d..e5b78628eb 100644
--- a/demos/session_automotive/src/main/AndroidManifest.xml
+++ b/demos/session_automotive/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="androidx.media3.demo.session.automotive">
 
   <uses-sdk/>
@@ -43,8 +42,7 @@
       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 e76ab36c00..9a8a12d452 100644
--- a/demos/shortform/src/main/AndroidManifest.xml
+++ b/demos/shortform/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   package="androidx.media3.demo.shortform">
 
   <application
@@ -22,8 +21,7 @@
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
     android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
-    android:taskAffinity=""
-    tools:replace="android:name">
+    android:taskAffinity="">
     <activity
       android:exported="true"
       android:name=".MainActivity">