diff options
| author | 2022-10-26 04:04:06 +0000 | |
|---|---|---|
| committer | 2022-10-26 04:04:06 +0000 | |
| commit | f7c5787ab39dfbad4f8effceaa86c4fb18aebf9d (patch) | |
| tree | 459cfc7178306f6208aec4575b5b5c3c17fcc741 | |
| parent | ccb0dc32f446abeea0f51f8ae4ee322a56939332 (diff) | |
| parent | 665d379b9c1b0aa4ee25d0f97895c763884ae262 (diff) | |
Merge "Fix NPE when finishing remote animation" am: a58ffe3791 am: 665d379b9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260542
Change-Id: I855732d4c8011820c307837830fd0c6f90384b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/RemoteAnimationController.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/RemoteAnimationController.java b/services/core/java/com/android/server/wm/RemoteAnimationController.java index 8db5289f8b45..d34e610fa0fd 100644 --- a/services/core/java/com/android/server/wm/RemoteAnimationController.java +++ b/services/core/java/com/android/server/wm/RemoteAnimationController.java @@ -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); } - // 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"); } |