commit 737c7f21eca7f26ae7d93d4548fc347d72007137
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 08 18:42:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 08 18:42:53 2023 +0000
tree b1e1ea49c723a1a3399331abed3f3389077bc79b
parent 8ee4ad660494404c7bdd0c6fc708a3f10b8fd5f6
parent 1834581bc0eaa349f6fa43f12d76cc2b8f842f27

Merge "Fix null-pointer in AbsSwipeUpHandler.buildAnimationController" into udc-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 3a6566a..63f1336 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -830,7 +830,8 @@
      * @return Whether we can create the launcher controller or update its progress.
      */
     private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
-        return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
+        return mGestureState.getEndTarget() != HOME
+                && !mHasEndedLauncherTransition && mActivity != null;
     }
 
     @Override