commit 2ca7e2695c5951cde8382ca45b3e5f2ced09e592
author Tony Wickham <twickham@google.com> Fri Oct 29 14:15:53 2021 -0700
committer Tony Wickham <twickham@google.com> Fri Oct 29 14:15:53 2021 -0700
tree 16a0bc4ac7b96eed9154f35df73b1ae5d9feb2cd
parent 00841576d49bbef4d684b55a8ee36276488b4561

Add null check when settling on LAST_TASK

Test: N/A
Fixes: 203237855
Change-Id: I511fde0ba3f22720ed1fe29769c97a3207a98a4b

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