commit 16119f5004658cad46cc2acc30d00de92c349657
author Tony Wickham <twickham@google.com> Mon Jun 21 22:41:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 21 22:41:32 2021 +0000
tree 7c7f24a5497b24f165607ebfb680773a1f0e165d
parent 96f496df03b3c727cb285eb482b6f5899f44f6fc
parent 82fc5c83a5f319d637574b8193127e23dc2b028f

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052402

Change-Id: Ia8a964effbc89754cd7f29986404d6ba1474a668

quickstep/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 5d701d4..37cb979 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -841,7 +841,13 @@
     }
 
     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