Merge "Revert "Remove flaky tests from presubmit."" into tm-dev
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user