diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-08 17:48:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-08 17:48:59 +0000 |
| commit | 0d6620774e19124a1d776dff7f1db28879a40a0b (patch) | |
| tree | 41d9aa53717db3eb6794a0f7a14dbf017ed42eac | |
| parent | 5f421b41212739905be143a77bf5f253c65b0c56 (diff) | |
| parent | bb31ed99a8c3684ae9f3f90f5e1faa687f0d5ef5 (diff) | |
| download | cts-0d6620774e19124a1d776dff7f1db28879a40a0b.tar.gz | |
Merge "Fix StartActivityTests#testNormalActivityCanNotSetActivityType" into android14-tests-dev
| -rw-r--r-- | tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java index 83f04b89fce..bd241e3a0ca 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java @@ -315,10 +315,9 @@ public class StartActivityTests extends ActivityManagerTestBase { if (useShellPermission) { waitAndAssertResumedActivity(BROADCAST_RECEIVER_ACTIVITY, "Activity should be started and resumed"); - if (type == ACTIVITY_TYPE_HOME && isAutomotive(mContext) - && hasSplitscreenMultitaskingFeature(mContext)) { - // For automotive devices with splitscreen multitasking, home activity might - // not be in front of the stack, hence, check for its visibility instead. + if (type == ACTIVITY_TYPE_HOME && isAutomotive(mContext)) { + // For automotive devices, home activity might not be in front of the stack, + // hence, check for its visibility instead. mWmState.assertHomeActivityVisible(/* visible= */ true); } else { mWmState.assertFrontStackActivityType( |