From 5423cf08ccaf0516010f7897f91ce0c568e2868c Mon Sep 17 00:00:00 2001 From: Garfield Tan Date: Fri, 6 Dec 2019 17:02:38 -0800 Subject: [PATCH] Use a display ID that's really invalid. When WMS for WmTests is set up, it gets the display info from real DisplayManagerService, which may not only have 1 display when the test is run. Therefore use Integer#MAX_VALUE to be safe. Bug: 145836235 Test: atest ActivityRecordTests#testCanBeLaunchedOnDisplay Change-Id: Ib809f895a86eafe1c1f5bbc511b1d4f0dec31d82 --- .../wmtests/src/com/android/server/wm/ActivityRecordTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index 7166829e01daf..dbcfa94c69bf8 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -203,7 +203,7 @@ public class ActivityRecordTests extends ActivityTestsBase { // An activity can be launched on default display. assertTrue(activity.canBeLaunchedOnDisplay(DEFAULT_DISPLAY)); // An activity cannot be launched on a non-existent display. - assertFalse(activity.canBeLaunchedOnDisplay(DEFAULT_DISPLAY + 1)); + assertFalse(activity.canBeLaunchedOnDisplay(Integer.MAX_VALUE)); } @Test