commit f378be865d54908815321f788f466e25b8c5005c
author Federico Baron <fbaron@google.com> Tue Nov 28 00:02:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 28 00:02:30 2023 +0000
tree 8f6386debad37fdd95b67b678e21e1510a525f26
parent eb293135953560b4a03382e6d911d0364a21e73f
parent c04ad685f51b0a52e9f7e48630af757e33ebc6a1

Merge "Fix activity leak in QuickstepLauncher" into main

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 165ed80..5b0c8c3 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -480,7 +480,11 @@
 
     @Override
     public void onDestroy() {
-        mAppTransitionManager.onActivityDestroyed();
+        if (mAppTransitionManager != null) {
+            mAppTransitionManager.onActivityDestroyed();
+        }
+        mAppTransitionManager = null;
+
         if (mUnfoldTransitionProgressProvider != null) {
             SystemUiProxy.INSTANCE.get(this).setUnfoldAnimationListener(null);
             mUnfoldTransitionProgressProvider.destroy();