Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed62d1ce authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove flaky tests from presubmit."" into tm-dev am: 44ee044a 

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

Change-Id: I3b49657b2e71743b1a3032bc206025d8ffa1e56d
parents 90c8cd02 44ee044a

core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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

core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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