commit ba720d098ebd6bbc1b376bb0945c76dcda3820b6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 21:33:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 03 21:33:21 2018 +0000
tree 5db65fb1704583f03dccea9c85e5e1f9c0df62db
parent ef20ece6c7badad523d8cdb89ddf80b41d1a916d
parent 47d1d1ec44bc1db1d5edf1eec39528cce1722420

Merge "Merge "Fix NPE finding target activity after recents animation controller crash" into pi-dev am: ebcfc4bb79 am: 4790ae379d"

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

diff --git a/services/core/java/com/android/server/am/RecentsAnimation.java b/services/core/java/com/android/server/am/RecentsAnimation.java
index b5047ae..a88f408 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 @@
 
                     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);