Detect support in ActivityManagerDockedStackTests.
If split multi-window mode is not supported, skip the tests.
Bug: 33456072
Test: cts -m CtsServicesHostTestCases --test android.server.cts.ActivityManagerDockedStackTests
Change-Id: Ia662693b92cece3abaa903940a4191abb98b0f88
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
index bf48c74..86e7b6c 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
@@ -34,6 +34,11 @@
private static final int STACK_SIZE = 300;
public void testStackList() throws Exception {
+ if (!supportsSplitScreenMultiWindow()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+ return;
+ }
+
executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME));
mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
@@ -43,7 +48,7 @@
}
public void testDockActivity() throws Exception {
- if (!supportsMultiWindowMode()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
@@ -55,6 +60,11 @@
}
public void testNonResizeableNotDocked() throws Exception {
+ if (!supportsSplitScreenMultiWindow()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+ return;
+ }
+
launchActivityInDockStack(NON_RESIZEABLE_ACTIVITY_NAME);
mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY_NAME});
@@ -65,7 +75,7 @@
}
public void testLaunchToSide() throws Exception {
- if (!supportsMultiWindowMode()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
@@ -81,6 +91,11 @@
}
public void testLaunchToSideAndBringToFront() throws Exception {
+ if (!supportsSplitScreenMultiWindow()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+ return;
+ }
+
launchActivityInDockStack(LAUNCHING_ACTIVITY);
final String[] waitForFirstVisible = new String[] {TEST_ACTIVITY_NAME};
final String[] waitForSecondVisible = new String[] {NO_RELAUNCH_ACTIVITY_NAME};
@@ -116,6 +131,11 @@
}
public void testLaunchToSideMultiple() throws Exception {
+ if (!supportsSplitScreenMultiWindow()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+ return;
+ }
+
launchActivityInDockStack(LAUNCHING_ACTIVITY);
mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
@@ -158,6 +178,11 @@
private void launchTargetToSide(String targetActivityName,
boolean taskCountMustIncrement) throws Exception {
+ if (!supportsSplitScreenMultiWindow()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+ return;
+ }
+
launchActivityInDockStack(LAUNCHING_ACTIVITY);
mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
@@ -213,6 +238,11 @@
}
public void testLaunchToSideMultipleWithFlag() throws Exception {
+ if (!supportsSplitScreenMultiWindow()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+ return;
+ }
+
launchActivityInDockStack(LAUNCHING_ACTIVITY);
mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
final String[] waitForActivitiesVisible =
@@ -242,7 +272,7 @@
}
public void testRotationWhenDocked() throws Exception {
- if (!supportsMultiWindowMode()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
@@ -282,7 +312,7 @@
}
public void testRotationWhenDockedWhileLocked() throws Exception {
- if (!supportsMultiWindowMode()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
@@ -320,7 +350,7 @@
}
public void testResizeDockedStack() throws Exception {
- if (!supportsMultiWindowMode()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
@@ -343,7 +373,7 @@
}
public void testActivityLifeCycleOnResizeDockedStack() throws Exception {
- if (!supportsMultiWindowMode()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java
index 735a303..e24db20 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java
@@ -78,6 +78,9 @@
private static final String AM_MOVE_TASK = "am stack movetask ";
+ private static final String AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW =
+ "am supports-split-screen-multiwindow";
+
private static final String INPUT_KEYEVENT_HOME = "input keyevent 3";
/** A reference to the device under test. */
@@ -276,6 +279,13 @@
|| PRETEND_DEVICE_SUPPORTS_ROTATION;
}
+ protected boolean supportsSplitScreenMultiWindow() throws DeviceNotAvailableException {
+ CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+ executeShellCommand(AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW, outputReceiver);
+ String output = outputReceiver.getOutput();
+ return !output.startsWith("false");
+ }
+
protected boolean hasDeviceFeature(String requiredFeature) throws DeviceNotAvailableException {
if (mAvailableFeatures == null) {
// TODO: Move this logic to ITestDevice.
