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

Commit c4f70a36 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix issues starting recents animation when starting a new activity" into pi-dev 

am: bd46f3f9

Change-Id: I78ad43a962affe60e04ae50513843aa9b4374176
parents ed8e0f6f bd46f3f9

services/core/java/com/android/server/am/ActivityStarter.java

+2 −1
Original line number Diff line number Diff line
@@ -1587,6 +1587,7 @@ class ActivityStarter { 
                    }

                }

            } else if (mOptions.getAvoidMoveToFront()) {

                mDoResume = false;

                mAvoidMoveToFront = true;

            }

        }
@@ -1929,7 +1930,7 @@ class ActivityStarter { 
        // Need to update mTargetStack because if task was moved out of it, the original stack may

        // be destroyed.

        mTargetStack = intentActivity.getStack();

        if (!mAvoidMoveToFront && !mMovedToFront && mDoResume) {

        if (!mMovedToFront && mDoResume) {

            if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Bring to front target: " + mTargetStack

                    + " from " + intentActivity);

            mTargetStack.moveToFront("intentActivityFound");

services/core/java/com/android/server/am/RecentsAnimation.java

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, 
                        .setMayWait(mUserController.getCurrentUserId())

                        .execute();

                mWindowManager.prepareAppTransition(TRANSIT_NONE, false);

                mWindowManager.executeAppTransition();



                targetActivity = mDefaultDisplay.getStack(WINDOWING_MODE_UNDEFINED,

                        mTargetActivityType).getTopActivity();