commit f3e9774ca69dc1ebe610263e396cc7a0cd2e5b55
author Tracy Zhou <tracyzhou@google.com> Fri Jul 02 18:35:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 02 18:35:47 2021 +0000
tree f42d953e025ceab60e88620513baa72099c949d1
parent b8de52725e92ad94ffdec657e08a956b07ca3a81
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: Iaea762668329b7068ed366f3588b4a679efce624

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);
+            }
         }
     }