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

Commit 4995fd3e authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Do not wait for transient hide transition targets" into udc-dev

parents 55a6e8d0 0fbc5aa6

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

+5 −0
Original line number Diff line number Diff line
@@ -10428,6 +10428,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


    @Override

    boolean isSyncFinished() {

        if (task != null && mTransitionController.isTransientHide(task)) {

            // The activity keeps visibleRequested but may be hidden later, so no need to wait for

            // it to be drawn.

            return true;

        }

        if (!super.isSyncFinished()) return false;

        if (mDisplayContent != null && mDisplayContent.mUnknownAppVisibilityController

                .isVisibilityUnknown(this)) {

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

+2 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,8 @@ public class TransitionTests extends WindowTestsBase { 
        final Transition.ChangeInfo activity1ChangeInfo = closeTransition.mChanges.get(activity1);

        assertNotNull(activity1ChangeInfo);

        assertTrue(activity1ChangeInfo.hasChanged());

        // No need to wait for the activity in transient hide task.

        assertTrue(activity1.isSyncFinished());



        activity1.setVisibleRequested(false);

        activity2.setVisibleRequested(true);