From a7b491e35eaa34bb7bb7c8adbacc305bea3a9fca Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 4 Oct 2023 15:50:45 -0700 Subject: [PATCH] Null reference to split callback Bug: 302551868 Test: Ran atest NexusLauncherTests:com.android.quickstep.TaplTestsSplitscreen which caused some regressions last time. Passed locally Change-Id: I94b28296cf12c5087ee3e878352c057d1d1a73de --- .../com/android/quickstep/util/SplitSelectStateController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index c8831c7db9..0c4fcf9bed 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -590,7 +590,7 @@ public class SplitSelectStateController { private final int mInitialTaskId; private final int mSecondTaskId; - private final Consumer mSuccessCallback; + private Consumer mSuccessCallback; RemoteSplitLaunchTransitionRunner(int initialTaskId, int secondTaskId, @Nullable Consumer callback) { @@ -617,6 +617,7 @@ public class SplitSelectStateController { finishAdapter.run(); if (mSuccessCallback != null) { mSuccessCallback.accept(true); + mSuccessCallback = null; } resetState(); });