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

Commit 75180bf9 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I30e4e785638c66de416c2178b856151e3216b69c
parents ab50ffd0 17a66a22

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

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

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

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