Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba5f8153 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Fix TaskRecordTests build failure 

The build failure is caused by conflicting when merge the patches. Call
mTaskStack and getTaskStack() instead of the original window controller
and corresponding container to fix it.

Test: Build
Test: atest TaskRecordTests
Change-Id: I617611e79a2e7d3e285c157b99ede9c156104348
parent 7e59dcb4

services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java

+3 −5
Original line number Diff line number Diff line
@@ -314,13 +314,11 @@ public class TaskRecordTests extends ActivityTestsBase { 
        // Wire up task and stack.

        task.mTask.mTaskRecord = task;

        doCallRealMethod().when(task.mTask).onDescendantOrientationChanged(any(), any());

        doReturn(stack.getWindowContainerController().mContainer).when(task.mTask).getParent();

        doReturn(stack.getTaskStack()).when(task.mTask).getParent();



        // Wire up stack and display content.

        doCallRealMethod().when(stack.mWindowContainerController.mContainer)

                .onDescendantOrientationChanged(any(), any());

        doReturn(display.mDisplayContent).when(stack.mWindowContainerController.mContainer)

                .getParent();

        doCallRealMethod().when(stack.mTaskStack).onDescendantOrientationChanged(any(), any());

        doReturn(display.mDisplayContent).when(stack.mTaskStack).getParent();



        activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);

        assertTrue("Bounds of the task should be pillarboxed.",