[Android] Fix ConcurrentModificationException in GestureHandlerOrchestrator#4274
Draft
kosmydel wants to merge 4 commits into
Draft
[Android] Fix ConcurrentModificationException in GestureHandlerOrchestrator#4274kosmydel wants to merge 4 commits into
kosmydel wants to merge 4 commits into
Conversation
…trator Use local snapshots of `gestureHandlers` when delivering and cancelling events instead of a shared `preparedHandlers` field and the live `asReversed()` view, both of which could throw during re-entrant state updates. Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes a
ConcurrentModificationExceptioninGestureHandlerOrchestratorwhen delivering and cancelling events. Event delivery now iterates over local snapshots ofgestureHandlersinstead of a sharedpreparedHandlersfield and the liveasReversed()view, both of which could be mutated mid-iteration during re-entrant state updates.Credit to @SudoPlz for the original fix. This PR upstreams it into the main repository
Note
We don't have a reliable repro for this. It surfaced in our Sentry logs as a crash, and the fix is based on inspection of the orchestrator's re-entrancy behavior.
Test steps
apps/basic-example,yarn android).Made with Cursor