Merge "Handle long press directly if recents transition is deferred" into main

quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java

@@ -120,7 +120,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 {

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.