aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 18:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: I8a21b8c6826cda2341bdf2f23698e1c4aa014246
This commit is contained in:
Tony Wickham
2021-06-21 22:40:09 +00:00
committed by Automerger Merge Worker
parent c3d74c43b0 82fc5c83a5
commit f0e1e8bf00
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@@ -813,7 +813,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