commit 49ea8680a87c741a85d03b945129340daa54e972
author Tony Wickham <twickham@google.com> Mon Nov 01 16:56:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 01 16:56:28 2021 +0000
tree 1aba1e2a98fe1890e0235deaca0615175f025bcd
parent 9e6b691e99ee2c1b39f4aa07a56f7864ab54025c
parent e62cedb2ec6d8241963fc653b4a39bdc5d27e20b

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

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

Change-Id: Ib0abf89969298e56bcc19800a72000b8ca708a04

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