Skip to content

[marshal methods] Make AndroidEnvironmentInternal.UnhandledException public #10775

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

Draft
Copilot wants to merge 5 commits into
base: main
Choose a base branch
from
+71 −2
Draft

[marshal methods] Make AndroidEnvironmentInternal.UnhandledException public #10775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c4579a
Initial plan
Copilot Feb 5, 2026
4f3b8c1
Make AndroidEnvironmentInternal.UnhandledException public to fix Meth…
Copilot Feb 5, 2026
23936e1
Update test to also verify UnhandledException method is public
Copilot Feb 5, 2026
afaba98
Match test to grendello's version from PR #10607
Copilot Feb 5, 2026
e9a4e22
Remove DebuggerBrowsable attributes - only valid on properties/fields
Copilot Feb 5, 2026
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
7 changes: 5 additions & 2 deletions src/Mono.Android.Runtime/Android.Runtime/AndroidEnvironmentInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
using System;
using System.ComponentModel;

namespace Android.Runtime
{
internal static class AndroidEnvironmentInternal
[EditorBrowsable (EditorBrowsableState.Never)]
public static class AndroidEnvironmentInternal
{
internal static Action<Exception>? UnhandledExceptionHandler;

internal static void UnhandledException (Exception e)
[EditorBrowsable (EditorBrowsableState.Never)]
public static void UnhandledException (Exception e)
{
if (UnhandledExceptionHandler == null) {
return;
Expand Down
66 changes: 66 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2153,5 +2153,71 @@ public void Plugin_Maui_Audio ([Values] AndroidRuntime runtime)
const string className = "Lcrc64467b05f37239e7a6/StreamMediaDataSource;";
Assert.IsTrue (DexUtils.ContainsClass (className, dexFile, AndroidSdkPath), $"`{dexFile}` should include `{className}`!");
}

[Test]
public void MarshalMethodsUnhandledExceptionRuntimeFixUpWorks ([Values] AndroidRuntime runtime)
{
const bool isRelease = true;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
return;
}

switch (runtime) {
case AndroidRuntime.NativeAOT:
Assert.Ignore ("NativeAOT does not support marshal methods");
break;

case AndroidRuntime.CoreCLR:
Assert.Ignore ("CoreCLR currently doesn't work due to a bug in Mono.Cecil");
break;
}

var proj = new XamarinAndroidApplicationProject {
IsRelease = isRelease,
EnableMarshalMethods = true,
};
proj.SetRuntime (runtime);
using var builder = CreateApkBuilder ();
Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");

string monoAndroidRuntimePath = Path.Combine (
Root,
builder.ProjectDirectory,
proj.IntermediateOutputPath,
"android-arm64",
"linked",
"Mono.Android.Runtime.dll"
);
FileAssert.Exists (monoAndroidRuntimePath);

using var asm = AssemblyDefinition.ReadAssembly (monoAndroidRuntimePath);
const string TypeName = "Android.Runtime.AndroidEnvironmentInternal";
TypeDefinition? type = null;

foreach (ModuleDefinition module in asm.Modules) {
foreach (TypeDefinition t in module.Types) {
if (t.FullName.Equals (TypeName, StringComparison.Ordinal)) {
type = t;
break;
}
}
}

Assert.NotNull (type, $"Failed to find the '{TypeName}' type in '{monoAndroidRuntimePath}'");
Assert.IsTrue (type.IsPublic, $"Type '{TypeName}' should be public");

// Additionally verify that the UnhandledException method is also public
const string MethodName = "UnhandledException";
MethodDefinition? method = null;
foreach (MethodDefinition m in type.Methods) {
if (m.Name.Equals (MethodName, StringComparison.Ordinal)) {
method = m;
break;
}
}

Assert.NotNull (method, $"Failed to find the '{MethodName}' method in type '{TypeName}'");
Assert.IsTrue (method.IsPublic, $"Method '{MethodName}' should be public");
}
}
}