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

Commit 70d1aef9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix] Fix the issue of transition animation splash screen in split... 

Merge "[Bugfix] Fix the issue of transition animation splash screen in split screen mode." am: 06654903 am: 5d876166 am: a59b7737 am: 4c973b36

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1867824

Change-Id: I93aa7353eabf334e0912aa662353e780edc81898
parents 778e0bc0 4c973b36

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

+15 −7
Original line number Diff line number Diff line
@@ -1451,13 +1451,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        final Task rootTask = getRootTask();



        // If we reparent, make sure to remove ourselves from the old animation registry.

        if (mAnimatingActivityRegistry != null) {

            mAnimatingActivityRegistry.notifyFinished(this);

        }

        mAnimatingActivityRegistry = rootTask != null

                ? rootTask.getAnimatingActivityRegistry()

                : null;

        updateAnimatingActivityRegistry();



        if (task == mLastParentBeforePip) {

            // Activity's reparented back from pip, clear the links once established
@@ -1490,6 +1484,20 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

    }



    void updateAnimatingActivityRegistry() {

        final Task rootTask = getRootTask();

        final AnimatingActivityRegistry registry = rootTask != null

                ? rootTask.getAnimatingActivityRegistry()

                : null;



        // If we reparent, make sure to remove ourselves from the old animation registry.

        if (mAnimatingActivityRegistry != null && mAnimatingActivityRegistry != registry) {

            mAnimatingActivityRegistry.notifyFinished(this);

        }



        mAnimatingActivityRegistry = registry;

    }



    /**

     * Sets {@link #mLastParentBeforePip} to the current parent Task, it's caller's job to ensure

     * {@link #getTask()} is set before this is called.

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

+3 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,9 @@ class Task extends TaskFragment { 
        adjustBoundsForDisplayChangeIfNeeded(getDisplayContent());



        mRootWindowContainer.updateUIDsPresentOnDisplay();



        // Ensure all animations are finished at same time in split-screen mode.

        forAllActivities(ActivityRecord::updateAnimatingActivityRegistry);

    }



    @Override