Merge "Fix NPE when finishing remote animation" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2022-10-26 08:15:41 +00:00
committed by Android (Google) Code Review

View File

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