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

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

Merge "Do not prepare PB animation if previous activity has no process.(cont)" into main

parents 3a6dcfef 7f94d3d0

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

+2 −1
Original line number Diff line number Diff line
@@ -389,7 +389,8 @@ class BackNavigationController { 
                    if ((prevTask.inMultiWindowMode() && prevParent != currParent)

                            // Do not animate to translucent task, it could be trampoline.

                            || hasTranslucentActivity(currentActivity, prevActivities)

                            || !allActivitiesHaveWindow(prevActivities)) {

                            || !allActivitiesHaveWindow(prevActivities)

                            || !allActivitiesHaveProcesses(prevActivities)) {

                        backType = BackNavigationInfo.TYPE_CALLBACK;

                    } else {

                        removedWindowContainer = prevTask;

services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java

+9 −0
Original line number Diff line number Diff line
@@ -209,9 +209,18 @@ public class BackNavigationControllerTests extends WindowTestsBase { 
        assertThat(typeToString(backNavigationInfo.getType()))

                .isEqualTo(typeToString(BackNavigationInfo.TYPE_CROSS_TASK));



        // Reset drawing status to test no process

        backNavigationInfo.onBackNavigationFinished(false);

        mBackNavigationController.clearBackAnimations(true);

        doReturn(false).when(recordA).hasProcess();

        backNavigationInfo = startBackNavigation();

        assertThat(typeToString(backNavigationInfo.getType()))

                .isEqualTo(typeToString(BackNavigationInfo.TYPE_CALLBACK));



        // Reset drawing status to test no window activity.

        backNavigationInfo.onBackNavigationFinished(false);

        mBackNavigationController.clearBackAnimations(true);

        doReturn(true).when(recordA).hasProcess();

        doReturn(null).when(recordA).findMainWindow();

        backNavigationInfo = startBackNavigation();

        assertThat(typeToString(backNavigationInfo.getType()))