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

Commit ebcfc4bb authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE finding target activity after recents animation controller crash" into pi-dev

parents 94862e76 82389a93

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

+3 −1
Original line number Diff line number Diff line
@@ -238,7 +238,9 @@ class RecentsAnimation implements RecentsAnimationCallbacks { 


                    final ActivityStack targetStack = mDefaultDisplay.getStack(

                            WINDOWING_MODE_UNDEFINED, mTargetActivityType);

                    final ActivityRecord targetActivity = targetStack.getTopActivity();

                    final ActivityRecord targetActivity = targetStack != null

                            ? targetStack.getTopActivity()

                            : null;

                    if (DEBUG) Slog.d(TAG, "onAnimationFinished(): targetStack=" + targetStack

                            + " targetActivity=" + targetActivity

                            + " mRestoreTargetBehindStack=" + mRestoreTargetBehindStack);