commit bfde6b2e5d9a0b96a7a11f25d217953dc8be46f2
author Schneider Victor-tulias <victortulias@google.com> Tue Jun 21 12:34:02 2022 -0700
committer Schneider Victor-tulias <victortulias@google.com> Tue Jun 21 12:34:02 2022 -0700
tree cd5ab2c58e656ccaff43f93fe6a35f1623781fa8
parent 3bc7b93ea526b22dfe21f5b1f960197ad3535184

Fix a potential null-pointer onActivityDestroyed

Fixes: 234082544
Test: started recents from a large screen and phone
Change-Id: I54ee93793ec146d1b0b0f00f23256aaca5975bc0

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 f6589de..f8df5bf 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -866,6 +866,7 @@
         TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
 
         if (mRecentsView != null) {
+            final View rv = mRecentsView;
             mRecentsView.getViewTreeObserver().addOnDrawListener(new OnDrawListener() {
                 boolean mHandled = false;
 
@@ -881,8 +882,7 @@
                     InteractionJankMonitorWrapper.begin(mRecentsView,
                             InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
 
-                    mRecentsView.post(() ->
-                            mRecentsView.getViewTreeObserver().removeOnDrawListener(this));
+                    rv.post(() -> rv.getViewTreeObserver().removeOnDrawListener(this));
                 }
             });
         }