diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-01 03:42:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-01 03:42:48 +0000 |
commit | 91bc108dc2fd292273f5b556c0b2038e6bc87b4c (patch) | |
tree | 5ee500b27d7f1d93a39ba3ab37e5d2bf6117a071 /services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java | |
parent | ebfc5b2e4d5e67396e8c89d4899606d2ad89c404 (diff) | |
parent | d88d1c7820e02db380134611ede2c2f937dbf0c5 (diff) | |
download | base-android11-d1-s6-release.tar.gz |
Merge cherrypicks of [12742081, 12740729, 12741823, 12741149, 12740897, 12740898, 12741537, 12742616, 12742617, 12742618, 12741671, 12738804, 12740899, 12740900, 12740901, 12740797, 12740798, 12742180, 12742181, 12740730, 12741672, 12741673, 12742182, 12742183] into rvc-d1-releaseandroid-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-release
Change-Id: Ib5c32cd4572f524cd80adb2e48b1c308f38c59d1
Diffstat (limited to 'services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java')
-rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index 6ab0697206e3..c6d788b10056 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -543,7 +543,7 @@ public class ActivityRecordTests extends ActivityTestsBase { final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); try { doReturn(false).when(stack).isTranslucent(any()); - assertFalse(mStack.shouldBeVisible(null /* starting */)); + assertTrue(mStack.shouldBeVisible(null /* starting */)); mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(), mActivity.getConfiguration())); |