From 1834581bc0eaa349f6fa43f12d76cc2b8f842f27 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 7 Jun 2023 10:39:25 -0700
Subject: [PATCH] Fix null-pointer in
 AbsSwipeUpHandler.buildAnimationController

Flag: not needed
Fixes: 271248485
Test: ran launcher
Change-Id: Ia9e0e68b9ee9273d82ed791b421a10ccb1fcdef2
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 3a6566a977..63f1336cca 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -830,7 +830,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
      * @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