summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2023-12-12 23:10:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-12-12 23:10:57 +0000
commitd48279bf1dfb4a6866cbdabc12a84703c438796d (patch)
tree4634dcdf8970cec4554e42aa0eb08b9a62bdce92
parent59c8b69ef4c6a54577d493f58557a1b58b85ab6a (diff)
parent229a1817714ee1402df9d4aff5c408fd1aef374d (diff)
downloadLauncher3-d48279bf1dfb4a6866cbdabc12a84703c438796d.tar.gz
Merge "Disabling ViewCaptureRule" into main
-rw-r--r--quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java2
-rw-r--r--tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index eced5a9a41..8d54dce8ef 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -144,7 +144,7 @@ public class FallbackRecentsTest {
.around(new TestStabilityRule())
.around(new NavigationModeSwitchRule(mLauncher))
.around(new FailureWatcher(mLauncher, viewCaptureRule::getViewCaptureData))
- .around(viewCaptureRule)
+ // .around(viewCaptureRule) b/315482167
.around(new TestIsolationRule(mLauncher, false))
.around(setLauncherCommand);
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 95ed401636..79d8c60049 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -257,7 +257,7 @@ public abstract class AbstractLauncherUiTest {
final RuleChain inner = RuleChain
.outerRule(new PortraitLandscapeRunner(this))
.around(new FailureWatcher(mLauncher, viewCaptureRule::getViewCaptureData))
- .around(viewCaptureRule)
+ // .around(viewCaptureRule) // b/315482167
.around(new TestIsolationRule(mLauncher, true));
return TestHelpers.isInLauncherProcess()