diff options
| author | 2022-09-23 13:15:09 +0000 | |
|---|---|---|
| committer | 2022-09-23 13:15:09 +0000 | |
| commit | 9b8636b58c983f05d3bb93fad70e798f6f7e37ef (patch) | |
| tree | 8425b9fb1ca2f857586697b4f50fa7b7a66b804c | |
| parent | 2a7d9570b1cedbed89f1238e75b831625aa856b9 (diff) | |
| parent | 97353972b79a78ba60fd7aa02ff0ec3f250f067b (diff) | |
Merge "Fix potential NPE when callback remote animator" am: 7fdf68db22 am: 80a173aca9 am: 97353972b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2227917
Change-Id: I944a8eda0c94cbf1fdaa6ae80cdf47b5396f3928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 888dc3aee86a..5d53c20270b5 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -3339,8 +3339,9 @@ class Task extends TaskFragment { ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "applyAnimationUnchecked, control: %s, task: %s, transit: %s", control, asTask(), AppTransition.appTransitionOldToString(transit)); + final int size = sources != null ? sources.size() : 0; control.addTaskToTargets(this, (type, anim) -> { - for (int i = 0; i < sources.size(); ++i) { + for (int i = 0; i < size; ++i) { sources.get(i).onAnimationFinished(type, anim); } }); |