| commit | c12b7355b1105f294f6704b15438957d53c4c576 | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Tue Aug 31 15:10:47 2021 -0700 |
| committer | Evan Rosky <erosky@google.com> | Tue Aug 31 15:10:47 2021 -0700 |
| tree | b95d0dc2bab53cbb4a9e1803897e8af74d317764 | |
| parent | aa28886d7bc095a7a76d3f708eb75396a8775a89 [diff] |
Fix NPE that happens occasionally on start-up Was not checking if topActivity was null. Bug: 189935087 Test: boot phone thousands of times. Change-Id: I3c779be5f09d82d52a3df9478c801a1963e0a5c2
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; }