Now uses: dotnet/java-interop#1334

jonathanpeppers · jonathanpeppers · commit aa0a4aed4f2f · 2025-05-12T12:11:27.000-05:00
diff --git a/external/Java.Interop b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit d07ed327dbd4477f0eab5d277b92fd4f57bfb893
+Subproject commit 174fd85c7fd5c81d48554c89afa7e5b618348160
diff --git a/src/Mono.Android/Microsoft.Android.Runtime/ManagedValueManager.cs b/src/Mono.Android/Microsoft.Android.Runtime/ManagedValueManager.cs
@@ -267,7 +267,7 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 	}
 
 	static GCHandle CreateReferenceTrackingHandle (IJavaPeerable value) =>
-		JavaMarshal.CreateReferenceTrackingHandle (value, value.PeerReference.Handle);
+		JavaMarshal.CreateReferenceTrackingHandle (value, value.JniObjectReferenceControlBlock);
 		
 	static unsafe void FreeHandle (GCHandle handle)
 	{

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`static GCHandle CreateReferenceTrackingHandle (IJavaPeerable value) =>`
`270`		`- JavaMarshal.CreateReferenceTrackingHandle (value, value.PeerReference.Handle);`
	`270`	`+ JavaMarshal.CreateReferenceTrackingHandle (value, value.JniObjectReferenceControlBlock);`
`271`	`271`
`272`	`272`	`static unsafe void FreeHandle (GCHandle handle)`
`273`	`273`	`{`