[NativeAOT] Raise AppDomain.UnhandledException event
#10092
Merged
Conversation
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
Context: 9ad492a Context: dotnet/runtime#102730 Commit 9ad492a had a TODO: > TODO: once dotnet/runtime#102730 is fixed, update > `UncaughtExceptionMarshaler` to do whatever it needs to do to cause > the `AppDomain.UnhandledException` event to be raised. dotnet/runtime#102730 *has* been fixed. Update `UncaughtExceptionMarshaler` to call `ExceptionHandling.RaiseAppDomainUnhandledExceptionEvent(object)` with the unhandled exception, so that the `AppDomain.UnhandledException` event is raised. Update `samples/NativeAOT` to subscribe to the `AppDomain.UnhandledException` event. Install the app: ./dotnet-local.sh build -t:Install samples/NativeAOT/NativeAOT.csproj and run the sample so that it throws an unhandled exception: adb shell am start --ez throw 1 net.dot.hellonativeaot/my.MainActivity and now `adb logcat` contains: I NativeAotFromAndroid: AppDomain.UnhandledException! I NativeAotFromAndroid: sender: [False ] I NativeAotFromAndroid: e.IsTerminating: True I NativeAotFromAndroid: e.ExceptionObject: System.InvalidOperationException: What happened? I NativeAotFromAndroid: at NativeAOT.MainActivity.OnCreate(Bundle savedInstanceState) + 0x2f4 I NativeAotFromAndroid: at Android.App.Activity.n_OnCreate_Landroid_os_Bundle_(IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState) + 0xc8 showing that the `AppDomain.UnhandledException` event was raised.
There was a problem hiding this comment.
Pull Request Overview
This PR updates the behavior of unhandled exceptions for NativeAOT by ensuring that the AppDomain.UnhandledException event is raised.
- Updated UncaughtExceptionMarshaler.cs to call ExceptionHandling.RaiseAppDomainUnhandledExceptionEvent(e)
- Modified samples/NativeAOT/MainApplication.cs to subscribe to the AppDomain.UnhandledException event and log relevant details
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/Microsoft.Android.Runtime.NativeAOT/UncaughtExceptionMarshaler.cs | Replace the commented-out call with a call to raise the AppDomain.UnhandledException event. |
| samples/NativeAOT/MainApplication.cs | Add an event subscription for AppDomain.CurrentDomain.UnhandledException. |
Comments suppressed due to low confidence (1)
src/Microsoft.Android.Runtime.NativeAOT/UncaughtExceptionMarshaler.cs:19
- There is an inconsistency in the naming of the exception variable: the logging and event-raising use 'e' whereas the original handler is called with 'exception'. Ensure the same variable name is used consistently throughout the method.
OriginalHandler?.UncaughtException (thread, exception);
jonathanpeppers
approved these changes
Apr 30, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Context: 9ad492a
Context: dotnet/runtime#102730
Commit 9ad492a had a TODO:
dotnet/runtime#102730 has been fixed.
Update
UncaughtExceptionMarshalerto callExceptionHandling.RaiseAppDomainUnhandledExceptionEvent(object)with the unhandled exception, so that theAppDomain.UnhandledExceptionevent is raised.Update
samples/NativeAOTto subscribe to theAppDomain.UnhandledExceptionevent.Install the app:
and run the sample so that it throws an unhandled exception:
and now
adb logcatcontains:showing that the
AppDomain.UnhandledExceptionevent was raised.