diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index 7e6116720b..04c420e398 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -439,7 +439,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC // starting the gesture. In that case, we need to clean-up an unfinished or un-started // animation. if (mActiveCallbacks != null && mInteractionHandler != null) { - if (mTaskAnimationManager.isRecentsAnimationRunning()) { + if (mTaskAnimationManager.isRecentsAnimationRunning() + && !allowInterceptByParent()) { // The animation started, but with no movement, in this case, there will be no // animateToProgress so we have to manually finish here. In the case of // ACTION_CANCEL, someone else may be doing something so finish synchronously.