Skip to content

[nativeaot] fix default SynchronizationContext #9883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2025
Merged

[nativeaot] fix default SynchronizationContext #9883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Mono.Android/Android.App/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ namespace Android.App {

partial class Application {

static Application () {
// NOTE: do not remove, removes the beforefieldinit flag for JNIEnvInit.SetSynchronizationContext()
}

static Context? _context;
public static Context Context {
get {
Expand Down
3 changes: 1 addition & 2 deletions src/Mono.Android/Android.Runtime/JNIEnvInit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ internal static void InitializeJniRuntime (JniRuntime runtime)
{
androidRuntime = runtime;
ValueManager = runtime.ValueManager;
SetSynchronizationContext ();
}

[UnmanagedCallersOnly]
Expand Down Expand Up @@ -136,8 +137,6 @@ internal static unsafe void Initialize (JnienvInitializeArgs* args)
[DllImport ("xamarin-app")]
static extern unsafe void xamarin_app_init (IntPtr env, delegate* unmanaged <int, int, int, IntPtr*, void> get_function_pointer);

// NOTE: prevents Android.App.Application static ctor from running
[MethodImpl (MethodImplOptions.NoInlining)]
static void SetSynchronizationContext () =>
SynchronizationContext.SetSynchronizationContext (Android.App.Application.SynchronizationContext);
}
Expand Down
Loading