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

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

Merge "Do not attach rotating starting surface to task" into main

parents 4a5c377a f392df6c

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

+4 −1
Original line number Diff line number Diff line
@@ -2867,7 +2867,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (mStartingData != null) {

            if (mStartingData.mAssociatedTask != null) {

                // The snapshot type may have called associateStartingDataWithTask().

                // If this activity is rotated, don't attach to task to preserve the transform.

                if (!hasFixedRotationTransform()) {

                    attachStartingSurfaceToAssociatedTask();

                }

            } else if (isEmbedded()) {

                associateStartingWindowWithTaskIfNeeded();

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -5506,7 +5506,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    @Override

    public SurfaceControl getAnimationLeashParent() {

        if (isStartingWindowAssociatedToTask()) {

        if (mActivityRecord != null && !mActivityRecord.hasFixedRotationTransform()

                && isStartingWindowAssociatedToTask()) {

            return mStartingData.mAssociatedTask.mSurfaceControl;

        }

        return super.getAnimationLeashParent();