Merge "Set the listeners to null on unregister" into main

2026-02-27 23:36:47 +00:00 · 2024-05-17 08:33:03 +00:00
parent c4079927f9 2552cc78ed
commit 33967ebcea
2 changed files with 2 additions and 0 deletions
--- a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java
@@ -93,6 +93,7 @@ public class DesktopVisibilityController {
     */
    public void unregisterSystemUiListener() {
        SystemUiProxy.INSTANCE.get(mLauncher).setDesktopTaskListener(null);
+        mDesktopTaskListener = null;
    }

    /**
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -983,6 +983,7 @@ public class SplitSelectStateController {
        void onDestroy() {
            SystemUiProxy.INSTANCE.get(mLauncher).unregisterSplitSelectListener(
                    mSplitSelectListener);
+            mSplitSelectListener = null;
        }

        /**