commit f7526085a9df945422a9385b2f824add3b97f636
author Alex Chau <alexchau@google.com> Fri Jun 24 10:05:27 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 24 10:05:27 2022 +0000
tree c32abffecf98374578fcb2977e2195f6072e4fd6
parent f6674c27f746bc64046782004adf308ab570130c
parent 7ba6cadf27d0014882e1ffc2d5ac80cd8eaea582

Merge "Check null before getting DeviceProfile in AbsSwipeUpHandler" into tm-qpr-dev

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 b5a0659..0972e4e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1136,7 +1136,7 @@
             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