Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev am: 8a0e91b330

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15730945 Change-Id: I20c2eea060fc170e888d4aa8ec9e834507f85ee5
2021-09-01 01:48:16 +00:00
parent a30438a13f 8a0e91b330
commit e0729a2cef
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;
            }