Guard GetContainerFactory calls with RuntimeFeature.TrimmableTypeMap

simonrozsival · Copilot · simonrozsival · commit 71ed63624a92 · 2026-03-22T00:10:17.000+01:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/external/Java.Interop b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit fb0952fad89af5a2cdddb47052cac2d42c79886a
+Subproject commit c14ba04c7faf689b211ad6a1df3eda43ab477b13
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 40b30131791e7e996e20d461f8d3694b273f6985
+Subproject commit d679f2becbac319c1ef35934d40866d87996f7b0
diff --git a/src/Mono.Android/Android.Runtime/JNIEnv.cs b/src/Mono.Android/Android.Runtime/JNIEnv.cs
@@ -26,7 +26,7 @@ public static partial class JNIEnv {
 
 		static Array ArrayCreateInstance (Type elementType, int length)
 		{
-			var factory = TrimmableTypeMap.Instance?.GetContainerFactory (elementType);
+			var factory = RuntimeFeature.TrimmableTypeMap ? TrimmableTypeMap.Instance?.GetContainerFactory (elementType) : null;
 			if (factory != null)
 				return factory.CreateArray (length, 1);
 
diff --git a/src/Mono.Android/Java.Interop/JavaConvert.cs b/src/Mono.Android/Java.Interop/JavaConvert.cs
@@ -148,7 +148,7 @@ params Type [] typeArguments
 			if (!typeof (IJavaPeerable).IsAssignableFrom (elementType))
 				return null;
 
-			return TrimmableTypeMap.Instance?.GetContainerFactory (elementType);
+			return RuntimeFeature.TrimmableTypeMap ? TrimmableTypeMap.Instance?.GetContainerFactory (elementType) : null;
 		}
 
 		static Func<IntPtr, JniHandleOwnership, object> GetJniHandleConverterForType ([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] Type t)

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static partial class JNIEnv {`
`26`	`26`
`27`	`27`	`static Array ArrayCreateInstance (Type elementType, int length)`
`28`	`28`	`{`
`29`		`- var factory = TrimmableTypeMap.Instance?.GetContainerFactory (elementType);`
	`29`	`+ var factory = RuntimeFeature.TrimmableTypeMap ? TrimmableTypeMap.Instance?.GetContainerFactory (elementType) : null;`
`30`	`30`	`if (factory != null)`
`31`	`31`	`return factory.CreateArray (length, 1);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ params Type [] typeArguments`
`148`	`148`	`if (!typeof (IJavaPeerable).IsAssignableFrom (elementType))`
`149`	`149`	`return null;`
`150`	`150`
`151`		`- return TrimmableTypeMap.Instance?.GetContainerFactory (elementType);`
	`151`	`+ return RuntimeFeature.TrimmableTypeMap ? TrimmableTypeMap.Instance?.GetContainerFactory (elementType) : null;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`static Func<IntPtr, JniHandleOwnership, object> GetJniHandleConverterForType ([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] Type t)`