commit b78cbf29e58321e3642a7c56ff94101e9e8d808b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 30 19:58:24 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 30 19:58:24 2021 +0000
tree b457b2ad54442ab1bc748ee0dd0e3ae057ac6d38
parent 2280f3d5fc432a0301c8766dd9f387c27ec2f4df
parent 8afeba605a650933fad5152cfee1378a80c2ae80

Merge "Possible fix for NullPointerException b/206040100." into sc-v2-dev

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 {