[TrimmableTypeMap] Java.Interop bump and update to ValueManagers and TypeManagers

src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs

@@ -61,7 +61,7 @@ static NativeAotRuntimeOptions CreateJreVM (NativeAotRuntimeOptions builder)
 			builder.TypeManager     ??= CreateDefaultTypeManager ();
 #endif  // NET
 
-			builder.ValueManager            ??= new JavaMarshalValueManager ();
+			builder.ValueManager            ??= CreateDefaultValueManager ();
 			builder.ObjectReferenceManager  ??= new Android.Runtime.AndroidObjectReferenceManager ();
 
 			if (builder.InvocationPointer != IntPtr.Zero || builder.EnvironmentPointer != IntPtr.Zero)
@@ -84,6 +84,13 @@ static JniRuntime.JniTypeManager CreateDefaultTypeManager ()
 			return new ManagedTypeManager ();
 		}
 
+		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "CoreCLR value manager is preserved by the MarkJavaObjects trimmer step.")]
+		[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This value manager won't be used in Native AOT builds in the future.")]
+		static JniRuntime.JniValueManager CreateDefaultValueManager ()
+		{
+			return new JavaMarshalValueManager ();
+		}
+
 		public override string? GetCurrentManagedThreadName ()
 		{
 			return Thread.CurrentThread.Name;

src/Mono.Android/Android.App/IntentFilterAttribute.Partial.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable enable
 
 using System;
 

src/Mono.Android/Android.Graphics/Color.cs

@@ -434,18 +434,13 @@ public static void RGBToHSV (int red, int green, int blue, float[] hsv)
 
 	public class ColorValueMarshaler : JniValueMarshaler<Color>
 	{
-		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 		const string ExpressionRequiresUnreferencedCode = "System.Linq.Expression usage may trim away required code.";
 
 		public override Type MarshalType {
 			get { return typeof (int); }
 		}
 
-		public override Color CreateGenericValue (
-				ref JniObjectReference reference,
-				JniObjectReferenceOptions options,
-				[DynamicallyAccessedMembers (Constructors)]
-				Type targetType)
+		public override Color CreateGenericValue (ref JniObjectReference reference, JniObjectReferenceOptions options, Type targetType)
 		{
 			throw new NotImplementedException ();
 		}

src/Mono.Android/Android.Runtime/AndroidRuntime.cs

@@ -314,11 +314,6 @@ public override void DeleteWeakGlobalReference (ref JniObjectReference value)
 	class AndroidTypeManager : JniRuntime.ReflectionJniTypeManager {
 		bool jniAddNativeMethodRegistrationAttributePresent;
 
-		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
-		const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
-		const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;
-		const DynamicallyAccessedMemberTypes MethodsConstructors = MethodsAndPrivateNested | Constructors;
-
 		public AndroidTypeManager (bool jniAddNativeMethodRegistrationAttributePresent)
 		{
 			this.jniAddNativeMethodRegistrationAttributePresent = jniAddNativeMethodRegistrationAttributePresent;
@@ -335,7 +330,6 @@ protected override IEnumerable<Type> GetTypesForSimpleReference (string jniSimpl
 		}
 
 		[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = "Temporary suppression until legacy typemap entries carry DAM annotations.")]
-		[return: DynamicallyAccessedMembers (MethodsConstructors)]
 		protected override Type? GetTypeForSimpleReference (string jniSimpleReference)
 		{
 			var type = base.GetTypeForSimpleReference (jniSimpleReference);
@@ -384,10 +378,7 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 			return JniRemappingLookup.GetReplacementMethodInfo (jniSourceType, jniMethodName, jniMethodSignature);
 		}
 
-		[return: DynamicallyAccessedMembers (Constructors)]
-		protected override Type? GetInvokerTypeCore (
-			[DynamicallyAccessedMembers (Constructors)]
-			Type type)
+		protected override Type? GetInvokerTypeCore (Type type)
 		{
 			if (type.IsInterface || type.IsAbstract) {
 				return JavaObjectExtensions.GetInvokerType (type)
@@ -500,17 +491,17 @@ static bool CallRegisterMethodByIndex (JniNativeMethodRegistrationArguments argu
 		[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>) instead.")]
 		public override void RegisterNativeMembers (
 				JniType nativeClass,
-				[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
 				Type type,
 				string? methods) =>
 			RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
 
 		[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type.GetType() can never statically know the string value parsed from parameter 'methods'.")]
 		[UnconditionalSuppressMessage ("Trimming", "IL2067", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
+		[UnconditionalSuppressMessage ("Trimming", "IL2070", Justification = "GetMethods can never statically know the string value parsed from parameter 'methods'.")]
 		[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
 		public override void RegisterNativeMembers (
 				JniType nativeClass,
-				[DynamicallyAccessedMembers (MethodsAndPrivateNested)] Type type,
+				Type type,
 				ReadOnlySpan<char> methods)
 		{
 			try {
@@ -852,7 +843,7 @@ internal void RemovePeer (IJavaPeerable value, IntPtr hash)
 
 		public override void ActivatePeer (
 			JniObjectReference reference,
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] Type type,
+			Type type,
 			ConstructorInfo cinfo,
 			object?[]? argumentValues)
 		{

src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs

@@ -9,16 +9,13 @@
 namespace Android.Runtime
 {
 	sealed class IJavaObjectValueMarshaler : JniValueMarshaler<IJavaObject> {
-
-		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 		const string ExpressionRequiresUnreferencedCode = "System.Linq.Expression usage may trim away required code.";
 
 		internal    static  IJavaObjectValueMarshaler              Instance    = new IJavaObjectValueMarshaler ();
 
 		public override IJavaObject CreateGenericValue (
 				ref JniObjectReference reference,
 				JniObjectReferenceOptions options,
-				[DynamicallyAccessedMembers (Constructors)]
 				Type? targetType)
 		{
 			throw new NotImplementedException ();

src/Mono.Android/Android.Runtime/JNIEnvInit.cs

@@ -188,14 +188,21 @@ internal static JniRuntime.JniValueManager CreateValueManager ()
 			}
 
 			if (RuntimeFeature.IsCoreClrRuntime) {
-				return new JavaMarshalValueManager ();
+				return CreateJavaMarshalValueManager ();
 			}
 
 			if (RuntimeFeature.IsNativeAotRuntime) {
-				return new JavaMarshalValueManager ();
+				return CreateJavaMarshalValueManager ();
 			}
 
 			throw new NotSupportedException ("Internal error: unknown runtime not supported");
+
+			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "CoreCLR value manager is preserved by the MarkJavaObjects trimmer step.")]
+			[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This value manager won't be used in Native AOT builds in the future.")]
+			JniRuntime.JniValueManager CreateJavaMarshalValueManager ()
+			{
+				return new JavaMarshalValueManager ();
+			}
 		}
 
 		static void InitializeCommonState (JnienvInitializeArgs args)

src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs

@@ -7,32 +7,20 @@
 
 namespace Microsoft.Android.Runtime;
 
-class JavaMarshalValueManager : AndroidReflectionJniValueManager
+[RequiresDynamicCode ("This value manager is reflection-backed and can break in AOT scenarios.")]
+[RequiresUnreferencedCode ("This value manager is reflection-backed and relies on custom trimming rules.")]
+sealed class JavaMarshalValueManager : JniRuntime.ReflectionJniValueManager
 {
 	const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 	const BindingFlags ActivationConstructorBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
 	static readonly Type[] XAConstructorSignature = new Type [] { typeof (IntPtr), typeof (JniHandleOwnership) };
 
-	bool disposed;
-
 	public JavaMarshalValueManager ()
 	{
 		JavaMarshalRegisteredPeers.InitializeIfNeeded ();
 	}
 
-	protected override void Dispose (bool disposing)
-	{
-		disposed = true;
-		base.Dispose (disposing);
-	}
-
-	void ThrowIfDisposed ()
-	{
-		if (disposed)
-			throw new ObjectDisposedException (nameof (JavaMarshalValueManager));
-	}
-
 	public override void WaitForGCBridgeProcessing ()
 	{
 		// Intentionally empty. The Mono runtime's own implementation acknowledges this
@@ -68,7 +56,7 @@ public override void FinalizePeer (IJavaPeerable value)
 		JavaMarshalRegisteredPeers.FinalizePeer (value);
 	}
 
-	public override void ActivatePeer (JniObjectReference reference, [DynamicallyAccessedMembers (Constructors)] Type type, ConstructorInfo cinfo, object?[]? argumentValues)
+	public override void ActivatePeer (JniObjectReference reference, Type type, ConstructorInfo cinfo, object?[]? argumentValues)
 	{
 		if (RuntimeFeature.TrimmableTypeMap)
 			throw new PlatformNotSupportedException ("Activating Java peers is not supported when TrimmableTypeMap is enabled.");
@@ -87,7 +75,7 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 			[DynamicallyAccessedMembers (Constructors)]
 			Type? targetType)
 	{
-		ThrowIfDisposed ();
+		EnsureNotDisposed ();
 
 		if (!reference.IsValid) {
 			return null;