diff options
| -rw-r--r-- | services/core/java/com/android/server/am/RecentsAnimation.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/RecentsAnimation.java b/services/core/java/com/android/server/am/RecentsAnimation.java index b5047aed8570..a88f4080a784 100644 --- a/services/core/java/com/android/server/am/RecentsAnimation.java +++ b/services/core/java/com/android/server/am/RecentsAnimation.java @@ -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); |