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

Commit 3e66fda5 authored by miaojian's avatar miaojian Committed by miao jian
Browse files

Fix NPE when finishing remote animation 



Make sure the access is in the synchronized block.

Bug: 254320691
Test: Manual test

Signed-off-by: default avatarmiaojian <miaojian1993@gmail.com>
Change-Id: Ia244b5ba2d3ba891319b32513841f397177cde0f
parent 22ff6270

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

+4 −4
Original line number Diff line number Diff line
@@ -308,11 +308,11 @@ class RemoteAnimationController implements DeathRecipient { 
                mService.closeSurfaceTransaction("RemoteAnimationController#finished");

                mIsFinishing = false;

            }

        }

            // Reset input for all activities when the remote animation is finished.

            final Consumer<ActivityRecord> updateActivities =

                    activity -> activity.setDropInputForAnimation(false);

            mDisplayContent.forAllActivities(updateActivities);

        }

        setRunningRemoteAnimation(false);

        ProtoLog.i(WM_DEBUG_REMOTE_ANIMATIONS, "Finishing remote animation");

    }