From b1c3f88185b3ccf2744ec8d31bc4f04df2f7c726 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 8 Feb 2022 00:32:03 +0000
Subject: [PATCH] Fix NPE when mRecentsView is null

The NPE was in an unused variable, so also address the TODO to use it as log rank.

Test: wwdebug, wwlogcat, quickswitch and check rank field
Fixes: 218216440
Change-Id: I173ae607e9f73e58880c0fb1b6e8f2352469816f
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index e218db1043..2cb7100378 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1198,10 +1198,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             // 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);
     }