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

Commit 6632259c authored by Kazuki Takise's avatar Kazuki Takise
Browse files

Compare containers in mChangingContainers with Task for change transitions 

Currently, it's trying to find an activity in mChangingContainers,
but as Task is added for change transitions, so it ends up getting
into the else statement and incorrectly set the animation CLOSING.

Bug: 157015435
Test: go/wm-smoke
Change-Id: I5be317f2e4adeceeeb06d4a1ec432d014685cf35
parent ff779f6d

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -387,9 +387,11 @@ class RemoteAnimationController implements DeathRecipient { 
        int getMode() {

        int getMode() {

            final DisplayContent dc = mWindowContainer.getDisplayContent();

            final DisplayContent dc = mWindowContainer.getDisplayContent();

            final ActivityRecord topActivity = mWindowContainer.getTopMostActivity();

            final ActivityRecord topActivity = mWindowContainer.getTopMostActivity();

            // Note that opening/closing transitions are per-activity while changing transitions

            // are per-task.

            if (dc.mOpeningApps.contains(topActivity)) {

            if (dc.mOpeningApps.contains(topActivity)) {

                return RemoteAnimationTarget.MODE_OPENING;

                return RemoteAnimationTarget.MODE_OPENING;

            } else if (dc.mChangingContainers.contains(topActivity)) {

            } else if (dc.mChangingContainers.contains(mWindowContainer)) {

                return RemoteAnimationTarget.MODE_CHANGING;

                return RemoteAnimationTarget.MODE_CHANGING;

            } else {

            } else {

                return RemoteAnimationTarget.MODE_CLOSING;

                return RemoteAnimationTarget.MODE_CLOSING;