diff options
| author | Charles Chen <charlesccchen@google.com> | 2022-07-06 14:19:59 +0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-13 01:44:42 +0000 |
| commit | 29c5ad9ec8ac46882938a363ea050d8c164a5a43 (patch) | |
| tree | 03b252513dcd45ff92441a7f77e977ba6226a39a | |
| parent | 7a3674e9c00e64b5fcde34d237a6004d6abdc1c2 (diff) | |
| download | cts-29c5ad9ec8ac46882938a363ea050d8c164a5a43.tar.gz | |
Fix TaskFragmentTrustedModeTest
This CL removes the check to verify if Activity does not exist
because it is started to Task instead after [1].
Test: atest TaskFragmentTrustedModeTest TaskFragmentOrganizerTest
Test: atest TaskFragmentOrganizerPolicyTest SplitActivityLifecycleTest
Fixes: 238054859
Bug: 233578672
[1]: b4bf0a8550911e3504cebf121062debdb1094f9e
Merged-In: I60bf16544da340c8846ae5007ce73ed7415eb974
Change-Id: I60bf16544da340c8846ae5007ce73ed7415eb974
(cherry picked from commit 07265b1c6ecd918a0839c7500972e1fc0dce382f)
Merged-In: I60bf16544da340c8846ae5007ce73ed7415eb974
| -rw-r--r-- | tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java | 12 |
1 files changed, 9 insertions, 3 deletions
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 c13c4eec7f8..9fd1a41a416 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java @@ -21,6 +21,7 @@ import static android.server.wm.jetpack.second.Components.SECOND_UNTRUSTED_EMBED import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.assumeActivityEmbeddingSupportedDevice; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,6 +34,7 @@ import android.content.Intent; import android.graphics.Rect; import android.os.Binder; import android.os.IBinder; +import android.platform.test.annotations.Presubmit; import android.server.wm.WindowManagerState.Task; import android.window.TaskFragmentCreationParams; import android.window.TaskFragmentInfo; @@ -49,6 +51,7 @@ import org.junit.Test; * Build/Install/Run: * atest CtsWindowManagerDeviceTestCases:TaskFragmentTrustedModeTest */ +@Presubmit public class TaskFragmentTrustedModeTest extends TaskFragmentOrganizerTestBase { private final ComponentName mTranslucentActivity = new ComponentName(mContext, @@ -248,7 +251,7 @@ public class TaskFragmentTrustedModeTest extends TaskFragmentOrganizerTestBase { */ @Test public void testUntrustedModeTaskFragment_startActivityInTaskFragmentOutsideOfParentBounds() { - final Task parentTask = mWmState.getRootTask(mOwnerTaskId); + Task parentTask = mWmState.getRootTask(mOwnerTaskId); final Rect parentBounds = new Rect(parentTask.getBounds()); final IBinder errorCallbackToken = new Binder(); final WindowContainerTransaction wct = new WindowContainerTransaction() @@ -263,8 +266,11 @@ public class TaskFragmentTrustedModeTest extends TaskFragmentOrganizerTestBase { // It is disallowed to start activity to TaskFragment with bounds outside of its parent // in untrusted mode. assertTaskFragmentError(errorCallbackToken, SecurityException.class); - mWmState.waitForAppTransitionIdleOnDisplay(mOwnerActivity.getDisplayId()); - mWmState.assertNotExist(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY); + + parentTask = mWmState.getRootTask(mOwnerTaskId); + assertWithMessage("Activity must be started in parent Task because it's not" + + " allowed to be embedded").that(parentTask.mActivities).contains( + mWmState.getActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY)); } /** |