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

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

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

am: ebcfc4bb

Change-Id: I8d3dc9a491fcda92470435ebb433114b5d2ec335
parents 39545635 ebcfc4bb

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);