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

Commit f7c5787a authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when finishing remote animation" am: a58ffe37 am: 665d379b 

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



Change-Id: I855732d4c8011820c307837830fd0c6f90384b37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccb0dc32 665d379b

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

+4 −4
Original line number Diff line number Diff line
@@ -323,11 +323,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");

    }