Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -882,12 +882,16 @@ sealed class ProxyValueMarshaler : JniValueMarshaler<object?> {

public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull]object? value, ParameterAttributes synchronize)
{
[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = "This code path is not used in Android projects.")]
[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.Interfaces)]
static Type GetType (object value) => value.GetType ();

if (value == null)
return new JniValueMarshalerState ();

var jvm = JniEnvironment.Runtime;

var vm = jvm.ValueManager.GetValueMarshaler (value.GetType ());
var vm = jvm.ValueManager.GetValueMarshaler (GetType (value));
if (vm != Instance) {
var s = vm.CreateObjectReferenceArgumentState (value, synchronize);
return new JniValueMarshalerState (s, vm);
Expand Down