From fa7394afbc00f26b735929fccbe94a4faa8dad85 Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Tue, 4 Oct 2022 15:51:45 +0800
Subject: [PATCH] Disable eager initialization of Jetpack libraries

Test: atest -c SettingsUnitTests
Fix: 208883742
Fix: 213872855
Change-Id: Ia2a2f88939d16c84255404696ea159c4a01b3bb5
---
 AndroidManifest.xml            | 7 +++++++
 tests/unit/AndroidManifest.xml | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 610f9624938..f7cffb76898 100644
--- a/AndroidManifest.xml
+++ b/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.settings"
           coreApp="true"
           android:sharedUserId="android.uid.system">
@@ -4635,6 +4636,12 @@
             </intent-filter>
         </activity>
 
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index b22f26a94ed..6170c0f2dd3 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -74,8 +74,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove"
-            tools:replace="android:authorities"/>
+            tools:node="remove"/>
 
     </application>