Repository navigation
fix(ndk): Keep the interrupt when SentryNdk waits for native libraries (JAVA-552) - #6667
Draft
runningcode wants to merge 2 commits into
Draft
runningcode wants to merge 2 commits into
runningcode wants to merge 2 commits into
Conversation
SentryNdk.init and close wrap an InterruptedException in an IllegalStateException. They don't own the calling thread, so they now restore its interrupt flag first, for the code that does. Refs #5513 Refs JAVA-552 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 18, 2026
4 of 9 tasks
📲 Install BuildsAndroid
|
Refs #5513 Refs JAVA-552 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
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
SentryNdk.initandSentryNdk.closewait for the native libraries to load, and wrap anInterruptedExceptionin anIllegalStateException. They don't own the calling thread, so they now restore its interrupt flag first, for the code that does.That's 2 sites. No other site in the audit needed only an interrupt fix. The three
Future.get()catches inDefaultAndroidEventProcessoralso restore the interrupt, but they're narrowings first, so they're in #6669.💡 Motivation and Context
This is part of the
catch (Throwable)audit. It replaces the interrupt fix in #6659.This PR is independent of its siblings and they can merge in any order:
rethrowIfFatalat boundary sitesLinkageErroris expectedUserInteractionTeststhread-safe list💚 How did you test it?
sentry-android-ndk.📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
#skip-changelog
🤖 Generated with Claude Code