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

Commit 8be8936a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move some AM tests back to FrameworksServicesTests"

parents 08f6bc03 d3eb645c

services/tests/wmtests/src/com/android/server/am/ActivityManagerInternalTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import org.mockito.MockitoAnnotations; 
 * Test class for {@link ActivityManagerInternal}.

 *

 * Build/Install/Run:

 *  atest WmTests:ActivityManagerInternalTest

 *  atest FrameworksServicesTests:ActivityManagerInternalTest

 */

public class ActivityManagerInternalTest {

    private static final int TEST_UID1 = 111;

services/tests/wmtests/src/com/android/server/am/ActivityManagerServiceTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ import java.util.function.Function; 
 * Test class for {@link ActivityManagerService}.

 *

 * Build/Install/Run:

 *  atest WmTests:ActivityManagerServiceTest

 *  atest FrameworksServicesTests:ActivityManagerServiceTest

 */

@SmallTest

@FlakyTest(bugId = 113616538)

services/tests/wmtests/src/com/android/server/am/ActivityManagerTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import java.util.List; 
 * Tests for {@link ActivityManager}.

 *

 * Build/Install/Run:

 *  atest WmTests:ActivityManagerTest

 *  atest FrameworksServicesTests:ActivityManagerTest

 */

@FlakyTest(detail = "Promote to presubmit if stable")

@Presubmit

services/tests/wmtests/src/com/android/server/am/AppErrorDialogTest.java→services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import java.io.File; 


/**

 * Build/Install/Run:

 *  atest WmTests:AppErrorDialogTest

 *  atest FrameworksServicesTests:AppErrorDialogTest

 */

@SmallTest

@FlakyTest(bugId = 113616538)

services/tests/wmtests/src/com/android/server/am/BroadcastRecordTest.java→services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import java.util.List; 
 * Test class for {@link BroadcastRecord}.

 *

 * Build/Install/Run:

 *  atest WmTests:BroadcastRecordTest

 *  atest FrameworksServicesTests:BroadcastRecordTest

 */

@SmallTest

@Presubmit