From 202bb8e7974da3d2a43a83f8264c8a293274b6cc Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Wed, 11 Jun 2025 16:03:21 -0400 Subject: [PATCH] Fix a missing null-check in AbsSwipeUpHandler Flag: EXEMPT bug fix Fixes: 423027896 Test: ran launcher (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c633e26434aeb9d1a4c4630d6db1d4ab477a1a1d) Merged-In: I44ae9215a83f169c1fa052d322ba5346312536b3 Change-Id: I44ae9215a83f169c1fa052d322ba5346312536b3 --- .../src/com/android/quickstep/AbsSwipeUpHandler.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 86fa65047c..aa9371d655 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1073,12 +1073,10 @@ public abstract class AbsSwipeUpHandler< } mHandled = true; - InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_QUICK_SWITCH, - 2000 /* ms timeout */); - InteractionJankMonitorWrapper.begin(mRecentsView, - Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); - InteractionJankMonitorWrapper.begin(mRecentsView, - Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS); + InteractionJankMonitorWrapper.begin( + rv, Cuj.CUJ_LAUNCHER_QUICK_SWITCH, /* timeoutMs= */ 2000); + InteractionJankMonitorWrapper.begin(rv, Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME); + InteractionJankMonitorWrapper.begin(rv, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS); rv.post(() -> rv.getViewTreeObserver().removeOnDrawListener(this)); }