Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b8636b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when callback remote animator" am: 7fdf68db am:... 

Merge "Fix potential NPE when callback remote animator" am: 7fdf68db am: 80a173ac am: 97353972

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2227917



Change-Id: I944a8eda0c94cbf1fdaa6ae80cdf47b5396f3928
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a7d9570 97353972

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

                    }

                });