diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java index 32f7bd535c..efa84d3b5d 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java @@ -114,7 +114,7 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { if (longPressRunnable != null) { OtherActivityInputConsumer oaic = getInputConsumerOfClass( OtherActivityInputConsumer.class); - if (oaic != null) { + if (oaic != null && oaic.hasStartedTouchTracking()) { oaic.setForceFinishRecentsTransitionCallback(longPressRunnable); setActive(mCurrentDownEvent); } else { diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index e724547d3e..eedd20485b 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -412,6 +412,14 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC } } + /** + * Returns whether this input consumer has started touch tracking (if touch tracking is not + * deferred). + */ + public boolean hasStartedTouchTracking() { + return mInteractionHandler != null; + } + /** * Called when the gesture has ended. Does not correlate to the completion of the interaction as * the animation can still be running.