commit 5c6173a8b96716441ed91480492c7a3d5d2f0a5a
author Vinit Nayak <peanutbutter@google.com> Wed Feb 09 23:31:57 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Wed Feb 09 23:31:57 2022 +0000
tree f55fd2d70c500e0c98fa43b97d4cc3f989c71ae1
parent bc4b55f97d50acae8d9c9ebdb5552f15c04e1fe5
parent 90e0fe39237b57d6d61715db00d27e09db186e7e

[automerge] Add null check for mRemoteTargetHandles for side task launch 2p: 90e0fe3923

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

Change-Id: I8d41d76a5178c15beca5028291fc0a314a580de3

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 13a2bda..8e772f6 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -984,13 +984,17 @@
      */
     public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
         int runningTaskViewId = getTaskViewIdFromTaskId(taskId);
-        if (mRunningTaskViewId != -1 && mRunningTaskViewId == runningTaskViewId) {
-            TransformParams params = mRemoteTargetHandles[0].getTransformParams();
-            RemoteAnimationTargets targets = params.getTargetSet();
-            if (targets != null && targets.findTask(taskId) != null) {
-                launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers,
-                        targets.nonApps);
-            }
+        if (mRunningTaskViewId == -1 ||
+                mRunningTaskViewId != runningTaskViewId ||
+                mRemoteTargetHandles == null) {
+            return;
+        }
+
+        TransformParams params = mRemoteTargetHandles[0].getTransformParams();
+        RemoteAnimationTargets targets = params.getTargetSet();
+        if (targets != null && targets.findTask(taskId) != null) {
+            launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers,
+                    targets.nonApps);
         }
     }