Fix ActivityVisibilityTests on Android TV
In testTurnScreenOnActivity, waiting all started activities are removed
is not done because Home activity is still existed.
Waiting all started activities should be applied with proper condition.
Bug: 309569041
Test: run cts -m CtsWindowManagerDeviceTestCases
-t android.server.wm.ActivityVisibilityTests
Change-Id: I2458276b231b35c18e98ca60bab25d2985ceb60a
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java
index 98f6a16..4f1c0cb 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java
@@ -202,7 +202,6 @@
@Test
public void testTurnScreenOnActivity() {
-
final LockScreenSession lockScreenSession = createManagedLockScreenSession();
final ActivitySessionClient activityClient = createManagedActivityClientSession();
testTurnScreenOnActivity(lockScreenSession, activityClient,
@@ -215,7 +214,10 @@
// (b/308213530).
// Wait for the existing TurnScreenOnActivity to finish and the home activity to be in
// stopped state as the display is OFF.
- mWmState.waitForAllStoppedActivities();
+ if (supportsLockScreen()) {
+ mWmState.waitForAllStoppedActivities();
+ }
+
// Start TURN_SCREEN_ON_ACTIVITY
launchActivity(TURN_SCREEN_ON_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
mWmState.assertVisibility(TURN_SCREEN_ON_ACTIVITY, true);
