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

Commit e82d9b2c authored by wilsonshih's avatar wilsonshih
Browse files

Always set transition ready in executeAppTransition. 

To set the transition ready signal even if the top resumed activity is
in a TaskFragment.

Flag: EXEMPT bugfix
Bug: 380830218
Test: atest ActivityLifecycleTests ActivityLifecycleTopResumedStateTests
Test: Launch an app that has use activity embedded for its activity,
move the app to desktop windowing mode, then launch another app. Close
the last app with finish and verify there won't encounter transition
timeout.

Change-Id: Ifed7edad77b9b7c67147a903ba538fd85ec10af0
parent fe30fc14

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

+0 −6
Original line number Diff line number Diff line
@@ -6292,12 +6292,6 @@ class Task extends TaskFragment { 
        return mAnimatingActivityRegistry;

    }



    @Override

    void executeAppTransition(ActivityOptions options) {

        mDisplayContent.executeAppTransition();

        ActivityOptions.abort(options);

    }



    private Rect getRawBounds() {

        return super.getBounds();

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -2129,7 +2129,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
    }



    void executeAppTransition(ActivityOptions options) {

        // No app transition applied to the task fragment.

        mDisplayContent.executeAppTransition();

        ActivityOptions.abort(options);

    }



    @Override