From 775fcb3fcfe90af3782e7996fa277123799f621a Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Fri, 15 Oct 2021 15:16:20 -0700
Subject: [PATCH] Ensure RecentsView RemoteTargetHandle's are non-null

Fixes: 201246959
Change-Id: Ifb8463e62765c92377db2a57ff7568e31da667aa
---
 quickstep/src/com/android/quickstep/TaskViewUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 284bc03323..12b071d77c 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -170,7 +170,7 @@ public final class TaskViewUtils {
 
         RemoteTargetHandle[] remoteTargetHandles;
         RemoteTargetHandle[] recentsViewHandles = recentsView.getRemoteTargetHandles();
-        if (v.isRunningTask()) {
+        if (v.isRunningTask() && recentsViewHandles != null) {
             // Re-use existing handles
             remoteTargetHandles = recentsViewHandles;
         } else {