DO NOT MERGE: Skip the test if don't support multi-window
Below test cases should be skipped if multiwindow is not supported.
1.android.server.cts.ActivityManagerActivityVisiblityTests#testFinishActivityInNonFocusedStack
2.android.server.cts.ActivityManagerAppConfigurationTests#testSameConfigurationFullSplitFullNoRelaunch
3.android.server.cts.ActivityManagerAppConfigurationTests#testSameConfigurationFullSplitFullRelaunch
4.android.server.cts.ActivityManagerAppConfigurationTests#testSameConfigurationSplitFullSplitNoRelaunch
5.android.server.cts.ActivityManagerAppConfigurationTests#testSameConfigurationSplitFullSplitRelaunch
Bug:63974989
Test:Build CTS
Test:run cts -m CtsServicesHostTestCases -t android.server.cts.ActivityManagerActivityVisiblityTests
Test:run cts -m CtsServicesHostTestCases -t android.server.cts.ActivityManagerAppConfigurationTests
Change-Id: I5376a5bfa6eaa9ba19e71ee0d3dd69f219398f15
Signed-off-by: Takeshi Katae <takeshi.katae.xm@kyocera.jp>
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java
index 866251c..9a281c2 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java
@@ -168,7 +168,7 @@
}
public void testFinishActivityInNonFocusedStack() throws Exception {
- if (!supportsSplitScreenMultiWindow()) {
+ if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
return;
}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
index a5c3149..7c7ee51 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
@@ -164,6 +164,10 @@
* relaunched twice and it should have same config as initial one.
*/
public void testSameConfigurationFullSplitFullRelaunch() throws Exception {
+ if (!supportsMultiWindowMode()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+ return;
+ }
moveActivityFullSplitFull(TEST_ACTIVITY_NAME);
}
@@ -171,6 +175,10 @@
* Same as {@link #testSameConfigurationFullSplitFullRelaunch} but without relaunch.
*/
public void testSameConfigurationFullSplitFullNoRelaunch() throws Exception {
+ if (!supportsMultiWindowMode()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+ return;
+ }
moveActivityFullSplitFull(RESIZEABLE_ACTIVITY_NAME);
}
@@ -219,6 +227,10 @@
* relaunched twice and it should have same config as initial one.
*/
public void testSameConfigurationSplitFullSplitRelaunch() throws Exception {
+ if (!supportsMultiWindowMode()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+ return;
+ }
moveActivitySplitFullSplit(TEST_ACTIVITY_NAME);
}
@@ -226,6 +238,10 @@
* Same as {@link #testSameConfigurationSplitFullSplitRelaunch} but without relaunch.
*/
public void testSameConfigurationSplitFullSplitNoRelaunch() throws Exception {
+ if (!supportsMultiWindowMode()) {
+ CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+ return;
+ }
moveActivitySplitFullSplit(RESIZEABLE_ACTIVITY_NAME);
}