| commit | 2b22bb33ffbeb53590e43d217ff0f5d6b1053d89 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 02 12:51:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 02 12:51:22 2023 +0000 |
| tree | 75988e13d4d50c5d8a104fb6232703ec5defce5c | |
| parent | b341f31fc7ad92dc151b5d9de935bc47faf5dd7f [diff] | |
| parent | d693b1406a98b646fa9ecf1d12f8562937d27616 [diff] |
Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" am: 78e1964a05 am: d693b1406a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2361489 Change-Id: Iff1c7f7e931932e3da697b8057cbc57fc8c78aff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java index d4bebea..1913091 100644 --- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -108,7 +108,8 @@ super(context, deviceState, taskAnimationManager, gestureState, touchTimeMs, continuingLastGesture, inputConsumer); - mRunningOverHome = mGestureState.getRunningTask().isHomeTask(); + mRunningOverHome = mGestureState.getRunningTask() != null + && mGestureState.getRunningTask().isHomeTask(); if (mRunningOverHome) { runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams().setHomeBuilderProxy(