Merge "Check null before getting DeviceProfile in AbsSwipeUpHandler" into tm-qpr-dev am: f7526085a9 am: e0f3bc67d9

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

Change-Id: I62b7dd26970960b8099bcbf956aff40d4fc1b5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2022-06-24 10:39:59 +00:00
committed by Automerger Merge Worker
@@ -1136,7 +1136,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
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