commit 06be7eb88ee96d1eba0bcedc7728d9f64c2bd6d1
author Vinit Nayak <peanutbutter@google.com> Fri Aug 25 20:52:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 25 20:52:45 2023 +0000
tree 203920f3bc74d53dadb27ecd9c2af583a4294a6a
parent 3f5e3ad419b3084794bb5cfbfb5895b55cd9d168

Revert "Hold WeakReference to split callback"

This reverts commit 3f5e3ad419b3084794bb5cfbfb5895b55cd9d168.

Reason for revert: b/297562709

Change-Id: I889d126e622e9cf13513365145eac28eaefa8627

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 9eebf2a..6d5aa16 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -101,7 +101,6 @@
 import com.android.wm.shell.splitscreen.ISplitSelectListener;
 
 import java.io.PrintWriter;
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -568,13 +567,13 @@
 
         private final int mInitialTaskId;
         private final int mSecondTaskId;
-        private final WeakReference<Consumer<Boolean>> mSuccessCallback;
+        private final Consumer<Boolean> mSuccessCallback;
 
         RemoteSplitLaunchTransitionRunner(int initialTaskId, int secondTaskId,
                 @Nullable Consumer<Boolean> callback) {
             mInitialTaskId = initialTaskId;
             mSecondTaskId = secondTaskId;
-            mSuccessCallback = new WeakReference<>(callback);
+            mSuccessCallback = callback;
         }
 
         @Override
@@ -594,8 +593,8 @@
                 TaskViewUtils.composeRecentsSplitLaunchAnimator(mLaunchingTaskView, mStateManager,
                         mDepthController, mInitialTaskId, mSecondTaskId, info, t, () -> {
                             finishAdapter.run();
-                            if (mSuccessCallback.get() != null) {
-                                mSuccessCallback.get().accept(true);
+                            if (mSuccessCallback != null) {
+                                mSuccessCallback.accept(true);
                             }
                             resetState();
                         });