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

2021-09-01 01:29:06 +00:00
parent cb776ca518 c12b7355b1
commit 8a0e91b330
1 changed files with 1 additions and 0 deletions
@@ -1124,6 +1124,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
            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;
            }