Merge "Revert "Revert "Revert "Hold WeakReference to split callback"""" into main

This commit is contained in:
Vinit Nayak
2023-09-07 18:29:40 +00:00
committed by Android (Google) Code Review

View File

@@ -101,7 +101,6 @@ import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
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;
@@ -586,13 +585,13 @@ public class SplitSelectStateController {
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
@@ -611,8 +610,8 @@ public class SplitSelectStateController {
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();
});