Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when finishing remote animation" am: a58ffe3791 am: 665d379b9c

Browse Source 
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>
This commit is contained in:
Chris Li
2022-10-26 04:04:06 +00:00
committed by Automerger Merge Worker
parent ccb0dc32f4 665d379b9c
commit f7c5787ab3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/RemoteAnimationController.java
View File

@@ -323,11 +323,11 @@ class RemoteAnimationController implements DeathRecipient {
mService.closeSurfaceTransaction("RemoteAnimationController#finished"); mService.closeSurfaceTransaction("RemoteAnimationController#finished");
mIsFinishing = false; mIsFinishing = false;
} }
}
// Reset input for all activities when the remote animation is finished. // Reset input for all activities when the remote animation is finished.
final Consumer<ActivityRecord> updateActivities = final Consumer<ActivityRecord> updateActivities =
activity -> activity.setDropInputForAnimation(false); activity -> activity.setDropInputForAnimation(false);
mDisplayContent.forAllActivities(updateActivities); mDisplayContent.forAllActivities(updateActivities);
}
setRunningRemoteAnimation(false); setRunningRemoteAnimation(false);
ProtoLog.i(WM_DEBUG_REMOTE_ANIMATIONS, "Finishing remote animation"); ProtoLog.i(WM_DEBUG_REMOTE_ANIMATIONS, "Finishing remote animation");
} }