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

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

Merge "Correct cross-task animation target for shell transition." into main

parents 2e8974e2 36c69e6e

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

+3 −1
Original line number Diff line number Diff line
@@ -778,7 +778,9 @@ class BackNavigationController { 
                closeTarget = close.asActivityRecord();

            } else if (isTaskSwitch(close, open)) {

                mSwitchType = TASK_SWITCH;

                closeTarget = close.asTask().getTopNonFinishingActivity();

                // The transition target must be activity in legacy transition.

                closeTarget = WindowManagerService.sEnableShellTransitions ? close

                        : close.asTask().getTopNonFinishingActivity();

            } else {

                mSwitchType = UNKNOWN;

                return;