commit 8a0e91b33073ba577559b387ea90d9504eb16916
author Evan Rosky <erosky@google.com> Wed Sep 01 01:29:06 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 01 01:29:06 2021 +0000
tree 4651f93d99e8757ec9f0cbe7ac601bc64f7811a2
parent cb776ca51813689778e5a667dfd4f592fc45d23f
parent c12b7355b1105f294f6704b15438957d53c4c576

Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index f06447b..494b953 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1124,6 +1124,7 @@
             if (target.mode == mode && target.taskInfo != null
                     // Compare component name instead of task-id because transitions will promote
                     // the target up to the root task while getTaskId returns the leaf.
+                    && target.taskInfo.topActivity != null
                     && target.taskInfo.topActivity.equals(mLauncher.getComponentName())) {
                 return true;
             }