commit 0d31266d00d819e1e97c486bd090e949caaffd85
author Tracy Zhou <tracyzhou@google.com> Fri Jul 02 18:45:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 02 18:45:38 2021 +0000
tree c9d9fa9db852e0af281aad7c8e608ba7a48af74e
parent d9428609798548754322c6af18a1373a71198d97
parent 6ffacb09a9f1cf5988b977eb5aa47211de47ccd6

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

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

Change-Id: Ia6be7ba248c4a40a997c44f9eefe0a93f6c65a42

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 538f626..3b32289 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -870,10 +870,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);
+            }
         }
     }