Merge "[RESTRICT AUTOMERGE] Partially revert "Do not update TFParentInfo while...

                .getTopNonFinishingActivity(), secondaryActivity);

    }

    @Test

    public void testTaskFragmentParentInfoChanged() {

        // Making a split

        final Activity secondaryActivity = createMockActivity();

        addSplitTaskFragments(mActivity, secondaryActivity, false /* clearTop */);

        // Updates the parent info.

        final TaskContainer taskContainer = mSplitController.getTaskContainer(TASK_ID);

        final Configuration configuration = new Configuration();

        final TaskFragmentParentInfo originalInfo = new TaskFragmentParentInfo(configuration,

                DEFAULT_DISPLAY, true /* visible */, false /* hasDirectActivity */,

                null /* decorSurface */);

        mSplitController.onTaskFragmentParentInfoChanged(mock(WindowContainerTransaction.class),

                TASK_ID, originalInfo);

        assertTrue(taskContainer.isVisible());

        // Making a public configuration change while the Task is invisible.

        configuration.densityDpi += 100;

        final TaskFragmentParentInfo invisibleInfo = new TaskFragmentParentInfo(configuration,

                DEFAULT_DISPLAY, false /* visible */, false /* hasDirectActivity */,

                null /* decorSurface */);

        mSplitController.onTaskFragmentParentInfoChanged(mock(WindowContainerTransaction.class),

                TASK_ID, invisibleInfo);

        // Ensure the TaskContainer is inivisible, but the configuration is not updated.

        assertFalse(taskContainer.isVisible());

        assertTrue(taskContainer.getTaskFragmentParentInfo().getConfiguration().diffPublicOnly(

                configuration) > 0);

        // Updates when Task to become visible

        final TaskFragmentParentInfo visibleInfo = new TaskFragmentParentInfo(configuration,

                DEFAULT_DISPLAY, true /* visible */, false /* hasDirectActivity */,

                null /* decorSurface */);

        mSplitController.onTaskFragmentParentInfoChanged(mock(WindowContainerTransaction.class),

                TASK_ID, visibleInfo);

        // Ensure the Task is visible and configuration is updated.

        assertTrue(taskContainer.isVisible());

        assertFalse(taskContainer.getTaskFragmentParentInfo().getConfiguration().diffPublicOnly(

                configuration) > 0);

    }

    /** Creates a mock activity in the organizer process. */

    private Activity createMockActivity() {

        return createMockActivity(TASK_ID);