From 0c943966d373d8ae7eef2b08e88ac44bf57d8a8d Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 5 Oct 2020 10:23:27 -0700
Subject: [PATCH] Add null check for input receiver before updating batching

- A change in the system (ie. sysui crash or nav mode change) could
  cause the input monitor to be disposed before the swipe animation
  settles

Bug: 170121063
Test: Kill sysui while swiping up

Change-Id: I1417b109fecdb98fae6197c7038dbe9307470853
---
 .../src/com/android/quickstep/TouchInteractionService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 7bf8fbafac..d3c4f55e9a 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -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) {