From 2afb94e059c0631366497d2402ec40b28132e8c6 Mon Sep 17 00:00:00 2001 From: Chilun Date: Tue, 25 Dec 2018 20:42:45 +0800 Subject: Add testStartHomeOnAllDisplays back Add the tests back since launcher's patch has merged into master. Bug: 118206886 Test: atest RootActivityContainerTests Test: Manual test on cf_x86_phone-userdebug Change-Id: I3fd00c9d6422c5be661a51c6397ef4648101357b --- .../wmtests/src/com/android/server/wm/RootActivityContainerTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java index e3bacf96a86c..67ee4ad91d91 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java @@ -395,8 +395,8 @@ public class RootActivityContainerTests extends ActivityTestsBase { /** * Tests that home activities can be started on the displays that supports system decorations. */ - // TODO (b/118206886): Will add it back once launcher's patch is merged into master. - private void testStartHomeOnAllDisplays() { + @Test + public void testStartHomeOnAllDisplays() { // Create secondary displays. final TestActivityDisplay secondDisplay = spy(createNewActivityDisplay()); mRootActivityContainer.addChild(secondDisplay, POSITION_TOP); -- cgit v1.2.3-59-g8ed1b