commit 1e391dbb4183f02d42d8453b90718ac4d3651876
author Alan Viverette <alanv@google.com> Mon Aug 30 15:18:24 2021 +0000
committer Alan Viverette <alanv@google.com> Mon Aug 30 15:18:25 2021 +0000
tree 1b79b16583b84d742343db33d3d9728eb8a0fe7b
parent de7f6663f0eaa8e9d315263c8bceb8dc74805f38

Remove startup provider from legacy MediaProvider manifest

Change-Id: I7a59c9ce791943f13885b553640e56335131085e
Fixes: 197891819
Test: android.provider.cts.media.MediaStoreTest

legacy/AndroidManifest.xml

diff --git a/legacy/AndroidManifest.xml b/legacy/AndroidManifest.xml
index 2396f58..2f7ea97 100644
--- a/legacy/AndroidManifest.xml
+++ b/legacy/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         package="com.android.providers.media"
         android:sharedUserId="android.media"
         android:versionCode="1024">
@@ -19,5 +20,11 @@
                 android:authorities="media_legacy"
                 android:exported="true"
                 android:permission="android.permission.WRITE_MEDIA_STORAGE" />
+
+        <!-- (b/197891819) Remove startup provider due to resource loading issues. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 </manifest>