commit ab6732640cba163bc82186025f2ee464197894b9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 30 20:46:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 30 20:46:50 2021 +0000
tree c3381dbaf3df26f2f254d4291a8283dd0031dd6c
parent c817dac4cd5d6b855b3dd0ae21d3cb198791da28
parent 7684d31b8e6d9aa1fe7fd4049e6dc4545ec57d5c

Merge "Possible fix for NullPointerException b/206040100." into sc-v2-dev am: b78cbf29e5 am: 7684d31b8e

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

Change-Id: I0f0f5a6fbcb1731c1d2eb1f3d7aef8317bac1430

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

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index e8077cf..f7f5efc 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -599,7 +599,9 @@
         if (confirmSecondSplitSelectApp()) {
             return;
         }
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
+        RecentsView recentsView = getRecentsView();
+        RemoteTargetHandle[] remoteTargetHandles = recentsView.mRemoteTargetHandles;
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask() && remoteTargetHandles != null) {
             if (!mIsClickableAsLiveTile) {
                 return;
             }
@@ -612,9 +614,7 @@
             }
 
             mIsClickableAsLiveTile = false;
-            RecentsView recentsView = getRecentsView();
             RemoteAnimationTargets targets;
-            RemoteTargetHandle[] remoteTargetHandles = recentsView.mRemoteTargetHandles;
             if (remoteTargetHandles.length == 1) {
                 targets = remoteTargetHandles[0].getTransformParams().getTargetSet();
             } else {