commit 6f6e97c653024a0ced3e59530f72295ff7c96049
author Vinit Nayak <peanutbutter@google.com> Mon Oct 18 23:19:21 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 18 23:19:21 2021 +0000
tree 34535b8277319d74b01de6b15beef24d59750ad9
parent 20c05fbd4c7694f2f81b5425a4d4c4f6120cd83e
parent 775fcb3fcfe90af3782e7996fa277123799f621a

Merge "Ensure RecentsView RemoteTargetHandle's are non-null" into sc-v2-dev

quickstep/src/com/android/quickstep/TaskViewUtils.java

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