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

Fix NPE when finishing remote animation

Browse Source 
Make sure the access is in the synchronized block.

Fix: 254393965
Bug: 254320691
Test: Manual test

Signed-off-by: miaojian <miaojian1993@gmail.com>
Merged-In: Ia244b5ba2d3ba891319b32513841f397177cde0f
Change-Id: Ia244b5ba2d3ba891319b32513841f397177cde0f
This commit is contained in:
miaojian
2022-10-19 10:45:04 +08:00
committed by Chris Li
parent a8345a1f05
commit 7f4424465e
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

@@ -320,11 +320,11 @@ class RemoteAnimationController implements DeathRecipient {
} finally { } finally {
mService.closeSurfaceTransaction("RemoteAnimationController#finished"); mService.closeSurfaceTransaction("RemoteAnimationController#finished");
} }
}
// 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");
} }