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

Commit ba720d09 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix NPE finding target activity after recents animation... 

Merge "Merge "Fix NPE finding target activity after recents animation controller crash" into pi-dev am: ebcfc4bb am: 4790ae37"
parents ef20ece6 47d1d1ec

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