commit 436a73d2d2545c6b56eb102b640e3050cd7fb62c
author Tony Wickham <twickham@google.com> Mon Nov 01 16:38:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 01 16:38:28 2021 +0000
tree 72efb7fac130b2f058e8c05a3f150db8ad15d116
parent 277683455cdfff9fc1afb2c4b575cd1b8e173c9a
parent d48fbecd1a5e50c1d49fd848386dafef6beecec2

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16150962

Change-Id: Ib9d50e6c351d0250b70a0f84db9701ad58cbf521

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