commit d8daf184bce2470bb8cde9a6fb55fd7b9fc2f0c1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 02 15:55:45 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 02 15:55:45 2024 +0000
tree 25f4c36de43643f6cc551a3dd2040d0c2e1528d4
parent 3faec179c062ddbf30cc4e79b5b5e1f2ae94c27b
parent 9240b68dd6c3074936b64b36375a66d8231ab5d7

Merge "Update where we end CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS" into main

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 9ad6b303..dc7ed24 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1149,12 +1149,18 @@
 
         if (endTarget != NEW_TASK) {
             InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_QUICK_SWITCH);
+        } else {
+            InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_QUICK_SWITCH);
         }
         if (endTarget != HOME) {
             InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME);
+        } else {
+            InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME);
         }
         if (endTarget != RECENTS) {
             InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
+        } else {
+            InteractionJankMonitorWrapper.end(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
         }
 
         switch (endTarget) {