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

Commit 82389a93 authored by Winson Chung's avatar Winson Chung
Browse files

Fix NPE finding target activity after recents animation controller crash 

Bug: 79156932
Test: Just an NPE fix
Change-Id: Ia8d7b717eea1426e45778d1e0a6da4ea76d815e7
parent f8f6e5af

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