diff options
| author | 2022-02-24 04:07:33 +0000 | |
|---|---|---|
| committer | 2022-02-24 04:07:33 +0000 | |
| commit | 17a66a2236e52dc055b57b543e2732a95aace308 (patch) | |
| tree | c9a1f4e39444c4910eca52e73b1182a48ae8e62b | |
| parent | d6904c7f41041656abb8c536e08f59c11a5a5d58 (diff) | |
| parent | 34b594d20a529f547c4191682aaeb591d82d6444 (diff) | |
Merge "Remove flaky tests from presubmit." into tm-dev
| -rw-r--r-- | core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java index 68d4cd4a97e7..1bc46a79f1c0 100644 --- a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java @@ -20,7 +20,6 @@ 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; @@ -37,7 +36,6 @@ 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 de4c5725c190..dbe027800e3f 100644 --- a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java @@ -18,7 +18,6 @@ package android.content; import android.content.pm.UserInfo; import android.os.RemoteException; -import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -35,7 +34,6 @@ 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 |