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

Commit 494afca0 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Do not update visibility inside clearing task 

Otherwise if the top activity doesn't occlude and there is a
pending global config change, the activity behind will be
scheduled a relaunch item and a destroy item. Then there may
be unexpected behavior by the onCreate from the relaunch.

Note that isClearingToReuseTask() is only true when starting a
new activity with clearing task. The visibility will still be
updated later when resuming next activity.

Bug: 238978283
Test: atest TaskTests#testPerformClearTop
Change-Id: I4b926adfef0a159f99d002f78838654e9f27baee
parent 661d0530

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −1
Original line number Diff line number Diff line
@@ -3528,7 +3528,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }



        final boolean isCurrentVisible = mVisibleRequested || isState(PAUSED, STARTED);

        if (updateVisibility && isCurrentVisible) {

        if (updateVisibility && isCurrentVisible

                // Avoid intermediate lifecycle change when launching with clearing task.

                && !task.isClearingToReuseTask()) {

            boolean ensureVisibility = false;

            if (occludesParent(true /* includingFinishing */)) {

                // If the current activity is not opaque, we need to make sure the visibilities of

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

+14 −0
Original line number Diff line number Diff line
@@ -268,6 +268,20 @@ public class TaskTests extends WindowTestsBase { 
        assertFalse(task.hasChild());

        // In real case, the task should be preserved for adding new activity.

        assertTrue(task.isAttached());



        final ActivityRecord activityA = new ActivityBuilder(mAtm).setTask(task).build();

        final ActivityRecord activityB = new ActivityBuilder(mAtm).setTask(task).build();

        final ActivityRecord activityC = new ActivityBuilder(mAtm).setTask(task).build();

        activityA.setState(ActivityRecord.State.STOPPED, "test");

        activityB.setState(ActivityRecord.State.PAUSED, "test");

        activityC.setState(ActivityRecord.State.RESUMED, "test");

        doReturn(true).when(activityB).shouldBeVisibleUnchecked();

        doReturn(true).when(activityC).shouldBeVisibleUnchecked();

        activityA.getConfiguration().densityDpi += 100;

        assertTrue(task.performClearTop(activityA, 0 /* launchFlags */).finishing);

        // The bottom activity should destroy directly without relaunch for config change.

        assertEquals(ActivityRecord.State.DESTROYING, activityA.getState());

        verify(activityA, never()).startRelaunching();

    }



    @Test