| commit | b7faa3d53378bc3b768fa8c7d366d125c6ce29eb | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Wed Sep 01 01:59:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 01 01:59:48 2021 +0000 |
| tree | 8902e941962048e5fb7f0acecec6e754b3a4c0dc | |
| parent | 0afd598570af8f81ab72c027489aefe0bce51a9a [diff] | |
| parent | e0729a2cefd1d3f8d331621035721c36294dfc5c [diff] |
Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev am: 8a0e91b330 am: e0729a2cef Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15730945 Change-Id: I19688906ad851ec0778bd07a48f175bd571a514b
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; }