diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index b5a0659fd6..0972e4e9c0 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1136,7 +1136,7 @@ public abstract class AbsSwipeUpHandler, mInputConsumerProxy.enable(); } if (endTarget == HOME) { - duration = mActivity.getDeviceProfile().isTaskbarPresent + duration = mActivity != null && mActivity.getDeviceProfile().isTaskbarPresent ? StaggeredWorkspaceAnim.DURATION_TASKBAR_MS : StaggeredWorkspaceAnim.DURATION_MS; // Early detach the nav bar once the endTarget is determined as HOME