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

Commit 7c66dfec authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Always set transition ready in executeAppTransition." into main

parents 536e89f0 e82d9b2c

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