diff options
| author | 2022-09-23 14:27:34 +0000 | |
|---|---|---|
| committer | 2022-09-23 14:27:34 +0000 | |
| commit | d01ae6f6fbbee22152c155b323b1206af0ca8b08 (patch) | |
| tree | 1499bdab2e1fe19777035ce292fc7a88ba096c4c | |
| parent | d84bec201ce133d43f351b69d306ee75843568fa (diff) | |
| parent | 9b8636b58c983f05d3bb93fad70e798f6f7e37ef (diff) | |
Merge "Fix potential NPE when callback remote animator" am: 7fdf68db22 am: 80a173aca9 am: 97353972b7 am: 9b8636b58c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2227917
Change-Id: Ibde2b3b1d72f805c1ffa24e55ca8bd608ba66edb
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 aede32c453f2..d6f295eb8f44 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -3327,8 +3327,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); } }); |