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: I6555707e2656a3b12a2c5668fd574e7878332d6f
2021-11-01 16:37:59 +00:00
parent 997bee0c73 d48fbecd1a
commit e62cedb2ec
1 changed files with 4 additions and 2 deletions
@@ -961,8 +961,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                } 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);