Merge "Ensure mConsumer isn't set to null in reset()." into sc-dev am: 82fc5c83a5 am: f0e1e8bf00

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052402 Change-Id: Icf283921b956e9822ecd7b3fa26755bc809b25da
2021-06-21 22:53:11 +00:00
parent 592e4b1146 f0e1e8bf00
commit 66b60ab354
1 changed files with 7 additions and 1 deletions
@@ -841,7 +841,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
    }

    private void reset() {
-        mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
+        if (mResetGestureInputConsumer != null) {
+            mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
+        } else {
+            // mResetGestureInputConsumer isn't initialized until onUserUnlocked(), so reset to
+            // NO_OP until then (we never want these to be null).
+            mConsumer = mUncheckedConsumer = InputConsumer.NO_OP;
+        }
        mGestureState = DEFAULT_STATE;
        // By default, use batching of the input events, but check receiver before using in the rare
        // case that the monitor was disposed before the swipe settled