commit d2039614e0c6750a5f60ccaa2f7629aeacfb0755
author Tracy Zhou <tracyzhou@google.com> Thu Jul 01 23:52:34 2021 -0700
committer Tracy Zhou <tracyzhou@google.com> Thu Jul 01 23:52:34 2021 -0700
tree facd69d98fc363d543dc4a2097d28b18e3b54bff
parent 679f8bb9cae34b8e6c43f6480e2268c4d73d7348

Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp

Fixes: 192458435
Test: N/A
Change-Id: I3f0b828bf9fa9645bbd253612aa073f37b21e4b2

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6767d32..50a4c2d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -843,10 +843,12 @@
     }
 
     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);
+            }
         }
     }