From 033f2afe38738b8ca4b56f0220f1cd10838729ef Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 16 Nov 2021 11:19:09 +0000
Subject: [PATCH] Revert "Add ScreenRecord to methods affected by a flaky
 problem"

This reverts commit ea6ee1c82461d7fe56d570d69f50d8d798adaa8d.

Reason for revert: Seems to increase the severity of the flaky problem
Bug: 204807156

Change-Id: I7b87f2abf45c9da21981f9361e320163bd7834bd
---
 tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java  | 2 --
 tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
index 36af8f0436..194ee4f1c9 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
@@ -28,7 +28,6 @@ import com.android.launcher3.tapl.Widget;
 import com.android.launcher3.tapl.WidgetResizeFrame;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 import com.android.launcher3.ui.TestViewHelpers;
-import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
 import com.android.launcher3.util.rule.ShellCommandRule;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
@@ -48,7 +47,6 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
 
     @Test
     @PortraitLandscape
-    @ScreenRecord // b/204807156
     public void testDragIcon() throws Throwable {
         clearHomescreen();
         mDevice.pressHome();
diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index 758c426940..fa39ce0604 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -45,7 +45,6 @@ import com.android.launcher3.tapl.Widget;
 import com.android.launcher3.tapl.Workspace;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 import com.android.launcher3.ui.TestViewHelpers;
-import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
 import com.android.launcher3.util.rule.ShellCommandRule;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
@@ -139,7 +138,6 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
     }
 
     @Test
-    @ScreenRecord // b/204807156
     public void testPendingWidget_autoRestored() {
         // A non-restored widget with no config screen gets restored automatically.
         LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false);