From 94b8f0f6e446bab6876d0827fa7c275c7337770f Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 25 Aug 2021 22:06:47 +0000
Subject: [PATCH 1/2] Disable eager initialization of Jetpack libraries

Bug: 197780098
Test: Launcher3 tests
Change-Id: I8f921ae26e873822ac2340ad78449cf1040af4cf
Merged-In: I8f921ae26e873822ac2340ad78449cf1040af4cf
(cherry picked from commit a88802ee922bec27ef7ce3a45471fc163afbb7a7)
---
 AndroidManifest-common.xml       | 7 +++++++
 tests/AndroidManifest-common.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index d725a16f80..3b6141b47f 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -19,6 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3">
 
     <!--
@@ -176,5 +177,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </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" />
     </application>
 </manifest>
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 918ec4af1a..4d980c47e0 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -16,6 +16,7 @@
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3.tests">
 
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
@@ -235,5 +236,11 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
+
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 </manifest>

From 183bca2dcce50780f8d434e99558fac1bcf2af28 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 26 Aug 2021 03:27:13 +0000
Subject: [PATCH 2/2] Temporarily disable Launcher3 tests affected by fling
 changes

Bug: 197802324
Test: TaplTestsLauncher3
Change-Id: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
Merged-In: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
(cherry picked from commit bc4dc49c6c48bc716df63def3b25c476a414a757)
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java     | 2 ++
 tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index a5038a1fb0..b856e0b560 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -44,6 +44,7 @@ import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -218,6 +219,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
         // Test opening all apps
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 4dd44f4193..d8576df947 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -247,6 +247,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testWidgets() throws Exception {
         // Test opening widgets.