[Mono.Android] Remove usages of JNINativeWrapper.CreateDelegate.

Author: jpobst

src/Mono.Android/Android.Animation/AnimatorSet.cs

@@ -1,49 +1,48 @@
-#if ANDROID_11
-
 using System;
+using Java.Interop;
 using Android.Runtime;
 
 namespace Android.Animation
 {
 	public partial class AnimatorSet
 	{
-		private static IntPtr id_setDuration_J;
+		static Delegate cb_setDuration_SetDuration_J_Landroid_animation_Animator_;
+
 		[Register ("setDuration", "(J)Landroid/animation/Animator;", "GetSetDuration_JHandler")]
-		public override Animator SetDuration (long duration)
+		public override unsafe Android.Animation.Animator SetDuration (long duration)
 		{
-			if (id_setDuration_J == IntPtr.Zero)
-				id_setDuration_J = JNIEnv.GetMethodID (class_ref, "setDuration", "(J)Landroid/animation/Animator;");
-			
-			if (base.GetType () == this.ThresholdType) {
-				return Java.Lang.Object.GetObject<AnimatorSet> (
-						JNIEnv.CallObjectMethod (base.Handle, id_setDuration_J, new JValue (duration)),
-						JniHandleOwnership.TransferLocalRef)!;
-			} else {
-				return Java.Lang.Object.GetObject<AnimatorSet> (
-						JNIEnv.CallNonvirtualObjectMethod (
-							base.Handle,
-							this.ThresholdClass,
-							JNIEnv.GetMethodID (ThresholdClass, "setDuration", "(J)Landroid/animation/Animator;"),
-							new JValue (duration)),
-						JniHandleOwnership.TransferLocalRef)!;
+			const string __id = "setDuration.(J)Landroid/animation/Animator;";
+			try {
+				JniArgumentValue* __args = stackalloc JniArgumentValue [1];
+				__args [0] = new JniArgumentValue (duration);
+				var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args);
+				return global::Java.Lang.Object.GetObject<Android.Animation.Animator> (__rm.Handle, JniHandleOwnership.TransferLocalRef);
+			} finally {
 			}
 		}
 
-		private static Delegate? cb_setDuration_J;
-		
-		private static Delegate GetSetDuration_JHandler ()
+#pragma warning disable 0169
+		static Delegate GetSetDuration_JHandler ()
 		{
-			if (cb_setDuration_J == null)
-				cb_setDuration_J = JNINativeWrapper.CreateDelegate (new Func<IntPtr, IntPtr, long, IntPtr> (n_SetDuration_J));
-			return cb_setDuration_J;
+			return cb_setDuration_SetDuration_J_Landroid_animation_Animator_ ??= new _JniMarshal_PPJ_L (n_SetDuration_J);
 		}
-		
-		private static IntPtr n_SetDuration_J (IntPtr jnienv, IntPtr native__this, long duration)
+
+		[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+		static IntPtr n_SetDuration_J (IntPtr jnienv, IntPtr native__this, long duration)
 		{
-			AnimatorSet @object = Java.Lang.Object.GetObject<AnimatorSet> (native__this, JniHandleOwnership.DoNotTransfer)!;
-			return JNIEnv.ToJniHandle (@object.SetDuration (duration));
+			if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r))
+				return default;
+
+			try {
+				var __this = global::Java.Lang.Object.GetObject<Android.Animation.AnimatorSet> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
+				return JNIEnv.ToLocalJniHandle (__this.SetDuration (duration));
+			} catch (global::System.Exception __e) {
+				__r.OnUserUnhandledException (ref __envp, __e);
+				return default;
+			} finally {
+				global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp);
+			}
 		}
+#pragma warning restore 0169
 	}
 }
-
-#endif

src/Mono.Android/Android.Animation/ValueAnimator.cs

@@ -1,50 +1,48 @@
-#if ANDROID_11
-
 using System;
+using Java.Interop;
 using Android.Runtime;
 
 namespace Android.Animation
 {
 	public partial class ValueAnimator
 	{
-		private static IntPtr id_setDuration_J;
+		static Delegate cb_setDuration_SetDuration_J_Landroid_animation_Animator_;
 
 		[Register ("setDuration", "(J)Landroid/animation/Animator;", "GetSetDuration_JHandler")]
-		public override Animator SetDuration (long duration)
+		public override unsafe Android.Animation.Animator SetDuration (long duration)
 		{
-			if (id_setDuration_J == IntPtr.Zero)
-				id_setDuration_J = JNIEnv.GetMethodID (class_ref, "setDuration", "(J)Landroid/animation/Animator;");
-			
-			if (base.GetType () == this.ThresholdType) {
-				return Java.Lang.Object.GetObject<ValueAnimator> (
-						JNIEnv.CallObjectMethod (base.Handle, id_setDuration_J, new JValue (duration)),
-						JniHandleOwnership.TransferLocalRef)!;
-			} else {
-				return Java.Lang.Object.GetObject<ValueAnimator> (
-						JNIEnv.CallNonvirtualObjectMethod (
-							base.Handle,
-							this.ThresholdClass,
-							JNIEnv.GetMethodID (ThresholdClass, "setDuration", "(J)Landroid/animation/Animator;"),
-							new JValue (duration)),
-						JniHandleOwnership.TransferLocalRef)!;
+			const string __id = "setDuration.(J)Landroid/animation/Animator;";
+			try {
+				JniArgumentValue* __args = stackalloc JniArgumentValue [1];
+				__args [0] = new JniArgumentValue (duration);
+				var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args);
+				return global::Java.Lang.Object.GetObject<Android.Animation.Animator> (__rm.Handle, JniHandleOwnership.TransferLocalRef);
+			} finally {
 			}
 		}
 
-		private static Delegate? cb_setDuration_J;
-		
-		private static Delegate GetSetDuration_JHandler ()
+#pragma warning disable 0169
+		static Delegate GetSetDuration_JHandler ()
 		{
-			if (cb_setDuration_J == null)
-				cb_setDuration_J = JNINativeWrapper.CreateDelegate (new Func<IntPtr, IntPtr, long, IntPtr> (n_SetDuration_J));
-			return cb_setDuration_J;
+			return cb_setDuration_SetDuration_J_Landroid_animation_Animator_ ??= new _JniMarshal_PPJ_L (n_SetDuration_J);
 		}
-		
-		private static IntPtr n_SetDuration_J (IntPtr jnienv, IntPtr native__this, long duration)
+
+		[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+		static IntPtr n_SetDuration_J (IntPtr jnienv, IntPtr native__this, long duration)
 		{
-			ValueAnimator @object = Java.Lang.Object.GetObject<ValueAnimator> (native__this, JniHandleOwnership.DoNotTransfer)!;
-			return JNIEnv.ToJniHandle (@object.SetDuration (duration));
+			if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r))
+				return default;
+
+			try {
+				var __this = global::Java.Lang.Object.GetObject<Android.Animation.ValueAnimator> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
+				return JNIEnv.ToLocalJniHandle (__this.SetDuration (duration));
+			} catch (global::System.Exception __e) {
+				__r.OnUserUnhandledException (ref __envp, __e);
+				return default;
+			} finally {
+				global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp);
+			}
 		}
+#pragma warning restore 0169
 	}
 }
-
-#endif