Merge "Remove flaky tests from presubmit." into tm-dev am: 17a66a2236

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16995644

Change-Id: If0829d765003dc2fdf5dd82acab417507af0a29b
This commit is contained in:
Sudheer Shanka
2022-02-24 04:34:43 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 4 deletions

View File

@@ -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

View File

@@ -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