Skip to content

[Mono.Android] add "built-in" delegate for MAUI+non-Shell #7267

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
jonpryor merged 1 commit into from
Aug 22, 2022
Merged

[Mono.Android] add "built-in" delegate for MAUI+non-Shell #7267

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
13 changes: 13 additions & 0 deletions src/Mono.Android/Android.Runtime/JNINativeWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,17 @@ internal static bool Wrap_JniMarshal_PPLLL_Z (this _JniMarshal_PPLLL_Z callback,
}
}

internal static IntPtr Wrap_JniMarshal_PPIZI_L (this _JniMarshal_PPIZI_L callback, IntPtr jnienv, IntPtr klazz, int p0, bool p1, int p2)
{
JNIEnv.WaitForBridgeProcessing ();
try {
return callback (jnienv, klazz, p0, p1, p2);
} catch (Exception e) when (_unhandled_exception (e)) {
AndroidEnvironment.UnhandledException (e);
return default;
}
}

internal static void Wrap_JniMarshal_PPIIII_V (this _JniMarshal_PPIIII_V callback, IntPtr jnienv, IntPtr klazz, int p0, int p1, int p2, int p3)
{
JNIEnv.WaitForBridgeProcessing ();
Expand Down Expand Up @@ -500,6 +511,8 @@ private static Delegate CreateBuiltInDelegate (Delegate dlg, Type delegateType)
return new _JniMarshal_PPLLL_L (Unsafe.As<_JniMarshal_PPLLL_L> (dlg).Wrap_JniMarshal_PPLLL_L);
case nameof (_JniMarshal_PPLLL_Z):
return new _JniMarshal_PPLLL_Z (Unsafe.As<_JniMarshal_PPLLL_Z> (dlg).Wrap_JniMarshal_PPLLL_Z);
case nameof (_JniMarshal_PPIZI_L):
return new _JniMarshal_PPIZI_L (Unsafe.As<_JniMarshal_PPIZI_L> (dlg).Wrap_JniMarshal_PPIZI_L);
case nameof (_JniMarshal_PPIIII_V):
return new _JniMarshal_PPIIII_V (Unsafe.As<_JniMarshal_PPIIII_V> (dlg).Wrap_JniMarshal_PPIIII_V);
case nameof (_JniMarshal_PPLLLL_V):
Expand Down
6 changes: 6 additions & 0 deletions src/Mono.Android/Android.Runtime/JNINativeWrapper.g.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,12 @@ var delegateTypes = new [] {
Return = "bool",
Invoke = "jnienv, klazz, p0, p1, p2",
},
new {
Type = "_JniMarshal_PPIZI_L",
Signature = "IntPtr jnienv, IntPtr klazz, int p0, bool p1, int p2",
Return = "IntPtr",
Invoke = "jnienv, klazz, p0, p1, p2",
},
new {
Type = "_JniMarshal_PPIIII_V",
Signature = "IntPtr jnienv, IntPtr klazz, int p0, int p1, int p2, int p3",
Expand Down