commit 2df19a23455557912d6fe992e3c76e503122ccb3
author Schneider Victor-tulias <victortulias@google.com> Thu Jun 23 18:29:09 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 23 18:29:09 2022 +0000
tree dbccc08e3949f99383de5a29c7618eca7b2f1da1
parent a5152338ea67523277f192683ff361846258f39e
parent bfde6b2e5d9a0b96a7a11f25d217953dc8be46f2

Merge "Fix a potential null-pointer onActivityDestroyed" into tm-qpr-dev

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