From 71f2a510ff51a431e610f34e75f8b524b27f8a33 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Thu, 3 Mar 2022 00:47:14 +0000 Subject: [PATCH] Revert "Remove flaky tests from presubmit." This reverts commit 34b594d20a529f547c4191682aaeb591d82d6444. Reason for revert: increased timeout in ag/17059565, so hopefully it can return to presubmit Change-Id: I9b1be7a80f8808629dbdab9f66cd01ec91d9cf1a Bug: 217733309 --- .../src/android/content/ManagedUserContentResolverTest.java | 2 ++ .../src/android/content/SecondaryUserContentResolverTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java index 1bc46a79f1c08..68d4cd4a97e7b 100644 --- a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java @@ -20,6 +20,7 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -36,6 +37,7 @@ import androidx.test.filters.LargeTest; * Run: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w \ * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ +@Presubmit @LargeTest public class ManagedUserContentResolverTest extends AbstractCrossUserContentResolverTest { @Override diff --git a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java index dbe027800e3fa..de4c5725c190b 100644 --- a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java @@ -18,6 +18,7 @@ package android.content; import android.content.pm.UserInfo; import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -34,6 +35,7 @@ import androidx.test.filters.LargeTest; * Run: adb shell am instrument -e class android.content.SecondaryUserContentResolverTest -w \ * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ +@Presubmit @LargeTest public class SecondaryUserContentResolverTest extends AbstractCrossUserContentResolverTest { @Override