From 7e9cfdf2548c8d740593b7c6135729b7e1ac7c3f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 18 Aug 2023 21:44:52 +0000
Subject: [PATCH] Fix crash if Launcher destroyed before AbsSwipeUpHandler
 invalidated

Test: manually call finish() in onActivityInit(), no crash when
handler is subsequently invalidated (did crash before this change)
Flag: None
Fixes: 295796661

Change-Id: I2dac7ca87bcdb700da2387309d5ad1d2f4ef43d7
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 796840d829..67b0d077b2 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -194,6 +194,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     ActiveGestureLog.INSTANCE.addLog("Launcher destroyed", LAUNCHER_DESTROYED);
                     mRecentsView = null;
                     mActivity = null;
+                    mStateCallback.clearState(STATE_LAUNCHER_PRESENT);
                 }
             };