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

This commit is contained in:
Tony Wickham
2021-11-01 16:22:15 +00:00
committed by Android (Google) Code Review

View File

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