diff options
author | Chris Li <lihongyu@google.com> | 2022-07-12 12:57:22 +0800 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-13 01:44:39 +0000 |
commit | 7a3674e9c00e64b5fcde34d237a6004d6abdc1c2 (patch) | |
tree | ef750c5035273e1914daa9536e7f58be2485e9a6 | |
parent | 8e48941b1aa3c4eec15afb681030378e356f1647 (diff) | |
download | cts-7a3674e9c00e64b5fcde34d237a6004d6abdc1c2.tar.gz |
Skip TaskFragmentTrustedModeTest for device not supporting AE
Bug: 238587417
Test: atest CtsWindowManagerDeviceTestCases
:TaskFragmentTrustedModeTest
Change-Id: Ief707eb89d103b7c2e60a9f5c97f283a1b525938
(cherry picked from commit f1bb048911ac5af45e62a5b86bc24bb1bdeb815c)
Merged-In: Ief707eb89d103b7c2e60a9f5c97f283a1b525938
4 files changed, 22 insertions, 0 deletions
diff --git a/tests/framework/base/windowmanager/Android.bp b/tests/framework/base/windowmanager/Android.bp index 168ee3f24b6..b786d833b67 100644 --- a/tests/framework/base/windowmanager/Android.bp +++ b/tests/framework/base/windowmanager/Android.bp @@ -67,6 +67,7 @@ android_test { "cts-wm-overlayapp-base", "cts-wm-shared", "platform-compat-test-rules", + "cts_window_jetpack_utils", ], test_suites: [ diff --git a/tests/framework/base/windowmanager/AndroidManifest.xml b/tests/framework/base/windowmanager/AndroidManifest.xml index 39c3d3ecbfd..1a86422e02c 100644 --- a/tests/framework/base/windowmanager/AndroidManifest.xml +++ b/tests/framework/base/windowmanager/AndroidManifest.xml @@ -38,6 +38,8 @@ android:enableOnBackInvokedCallback="true" android:testOnly="true"> <uses-library android:name="android.test.runner"/> + <uses-library android:name="androidx.window.extensions" + android:required="false" /> <activity android:name="android.server.wm.ActivityManagerTestBase$ConfigChangeHandlingActivity" android:resizeableActivity="true" diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java index d12b7c1dba9..477cc8d7f4b 100644 --- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java +++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java @@ -16,6 +16,7 @@ package android.server.wm.jetpack.utils; +import static android.server.wm.jetpack.utils.ExtensionUtil.assumeExtensionSupportedDevice; import static android.server.wm.jetpack.utils.ExtensionUtil.getWindowExtensions; import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getActivityBounds; import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getMaximumActivityBounds; @@ -28,6 +29,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; import android.app.Activity; import android.content.ComponentName; @@ -51,6 +53,7 @@ import com.android.compatibility.common.util.PollingCheck; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.function.Predicate; /** @@ -447,6 +450,13 @@ public class ActivityEmbeddingUtil { } } + public static void assumeActivityEmbeddingSupportedDevice() { + assumeExtensionSupportedDevice(); + assumeTrue("Device does not support ActivityEmbedding", + Objects.requireNonNull(getWindowExtensions()) + .getActivityEmbeddingComponent() != null); + } + private static void assertSplitInfoTopSplitIsCorrect(@NonNull List<SplitInfo> splitInfoList, @NonNull Activity primaryActivity, @NonNull Activity secondaryActivity) { assertFalse("Split info callback should not be empty", splitInfoList.isEmpty()); diff --git a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java index 385a5af9ed6..c13c4eec7f8 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java @@ -18,6 +18,7 @@ package android.server.wm; import static android.server.wm.WindowManagerState.STATE_RESUMED; import static android.server.wm.jetpack.second.Components.SECOND_UNTRUSTED_EMBEDDING_ACTIVITY; +import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.assumeActivityEmbeddingSupportedDevice; import static com.google.common.truth.Truth.assertThat; @@ -39,6 +40,7 @@ import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; +import org.junit.Before; import org.junit.Test; /** @@ -52,6 +54,13 @@ public class TaskFragmentTrustedModeTest extends TaskFragmentOrganizerTestBase { private final ComponentName mTranslucentActivity = new ComponentName(mContext, TranslucentActivity.class); + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + assumeActivityEmbeddingSupportedDevice(); + } + /** * Verifies the visibility of a task fragment that has overlays on top of activities embedded * in untrusted mode when there is an overlay over the task fragment. |