| commit | 66b60ab3546dcef9048c4b7aa87fde2461746b7d | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Mon Jun 21 22:53:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 22:53:11 2021 +0000 |
| tree | a2d8479cffee94b0b1af4713bdf1e1330b0a15c7 | |
| parent | 592e4b1146ce50c69889cb4dd2061f24dba2a6b4 [diff] | |
| parent | f0e1e8bf004ffc2a31be86cf9b996e824089ae77 [diff] |
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
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