commit 78e1964a055092d285e84b3766f70f8df8e28694
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 02 11:48:10 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 02 11:48:10 2023 +0000
tree 03c7477dd8702f0fd4c1bb42ccbfe482e971ac76
parent 2e8666eb7de7c323988fb98b4871c517e455276f
parent ed2f309652cfbac2844dc49518c1efa5591d8322

Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null"

quickstep/src/com/android/quickstep/FallbackSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 99f7bdd..3b11228 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -107,7 +107,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(