commit 7fdf68db22f617b82f8ba9a0a6ee81d262d53733
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 23 11:19:12 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 23 11:19:12 2022 +0000
tree 47e78ff6fa5c775cf50e4861235f4f491e97205f
parent bd37f6ff682a94000996b8a6ddf0e0608edd4c76
parent f3df5354a5ddbeb5ec2e88f4f72cb7224430d618

Merge "Fix potential NPE when callback remote animator"

services/core/java/com/android/server/wm/Task.java

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index bf5246f..e1ee045 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 @@
                 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);
                     }
                 });