commit d48fbecd1a5e50c1d49fd848386dafef6beecec2
author Tony Wickham <twickham@google.com> Mon Nov 01 16:22:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 01 16:22:15 2021 +0000
tree 04868ce338de723a0ab21971b0e649038d7e18dd
parent 33f9de022503946872ecb922dae3471aab940c42
parent 2ca7e2695c5951cde8382ca45b3e5f2ced09e592

Merge "Add null check when settling on LAST_TASK" into sc-v2-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index e8aa2fa..8444261 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -961,8 +961,10 @@
                 } else {
                     mStateCallback.setState(STATE_RESUME_LAST_TASK);
                 }
-                TaskViewUtils.setSplitAuxiliarySurfacesShown(
-                        mRecentsAnimationTargets.nonApps, true);
+                if (mRecentsAnimationTargets != null) {
+                    TaskViewUtils.setSplitAuxiliarySurfacesShown(
+                            mRecentsAnimationTargets.nonApps, true);
+                }
                 break;
         }
         ActiveGestureLog.INSTANCE.addLog("onSettledOnEndTarget " + endTarget);