Merge "Add null check for input receiver before updating batching" into ub-launcher3-master

2020-10-05 19:13:50 +00:00
parent e108cc609d 0c943966d3
commit 679d920bf5
1 changed files with 5 additions and 2 deletions
@@ -732,8 +732,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
    private void reset() {
        mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
        mGestureState = DEFAULT_STATE;
-        // By default, use batching of the input events
-        mInputEventReceiver.setBatchingEnabled(true);
+        // 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
+        if (mInputEventReceiver != null) {
+            mInputEventReceiver.setBatchingEnabled(true);
+        }
    }

    private void preloadOverview(boolean fromInit) {