From f9b81f24a405185a3a416f684df1bab0bb82d3c8 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Tue, 28 May 2024 11:23:37 -0700 Subject: [PATCH] Return false for isSplitSelectionActive() if controller not initialized Test: unable to repro Fixes: 342716244 Flag: EXEMPT bugfix Change-Id: I9d7d54d5f7571286778c0e82ef4082f9b5843c1d (cherry picked from commit b449116345fdf2bc8f778efa5879b8236aca1217) Merged-In: I9d7d54d5f7571286778c0e82ef4082f9b5843c1d --- .../com/android/launcher3/uioverrides/QuickstepLauncher.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 702997c442..602c35c672 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -740,6 +740,9 @@ public class QuickstepLauncher extends Launcher { @Override public boolean isSplitSelectionActive() { + if (mSplitSelectStateController == null) { + return false; + } return mSplitSelectStateController.isSplitSelectActive(); }