commit 6ffacb09a9f1cf5988b977eb5aa47211de47ccd6
author Tracy Zhou <tracyzhou@google.com> Fri Jul 02 18:35:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 02 18:35:15 2021 +0000
tree 90c0fb9ccb90ae815b3c5ae5e18fe00544ea4168
parent 781da1352f944f3e613486f42dcd6cd4055b2386
parent fa72529b051ae6b150666126cf7f4769c0a28181

Merge "Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp" into sc-dev am: fa72529b05

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184810

Change-Id: I94bff6e7bc83f86aab2fc12d3c2649e4b65360e6

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 fb5fdac..b2a4be8 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -863,10 +863,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);
+            }
         }
     }