Revert "Revert "Revert "Hold WeakReference to split callback"""
This reverts commit bb9fe162541201e15182dce36fadfc0db8f19db5.
Reason for revert: b/299403672
Change-Id: I8107bc69c033cb70333d5920cfee0700fe1f63a6
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();
});