From d2039614e0c6750a5f60ccaa2f7629aeacfb0755 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 1 Jul 2021 23:52:34 -0700
Subject: [PATCH] Check if live tile targetSet is null in
 launchSideTaskInLiveTileModeForRestartedApp

Fixes: 192458435
Test: N/A
Change-Id: I3f0b828bf9fa9645bbd253612aa073f37b21e4b2
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6767d32bac..50a4c2d26f 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -843,10 +843,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
-        if (mRunningTaskId != -1 && mRunningTaskId == taskId &&
-                getLiveTileParams().getTargetSet().findTask(taskId) != null) {
+        if (mRunningTaskId != -1 && mRunningTaskId == taskId) {
             RemoteAnimationTargets targets = getLiveTileParams().getTargetSet();
-            launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, targets.nonApps);
+            if (targets != null && targets.findTask(taskId) != null) {
+                launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers,
+                        targets.nonApps);
+            }
         }
     }