commit e8b200eb6bd84571f52a587bb4d78ce3a4ceca03
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 09 05:04:57 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 09 05:04:57 2022 +0000
tree a003f26e108d39ff174b606db63b17fb82bd55ec
parent 32319bf16639386e8c2bf25655f57323cd04ff94
parent b1c3f88185b3ccf2744ec8d31bc4f04df2f7c726

Merge "Fix NPE when mRecentsView is null"

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 e218db1..2cb7100 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1198,10 +1198,10 @@
             // We probably never received an animation controller, skip logging.
             return;
         }
-        int pageIndex = endTarget == LAST_TASK
+        int pageIndex = endTarget == LAST_TASK || mRecentsView == null
                 ? LOG_NO_OP_PAGE_INDEX
                 : mRecentsView.getNextPage();
-        // TODO: set correct container using the pageIndex
+        logger.withRank(pageIndex);
         logger.log(event);
     }