Skip to content

Commit b164936

Browse files
Add override to RegisterNativeMembers()
1 parent 786c29f commit b164936

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ public override void RegisterNativeMembers (
505505
[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type.GetType() can never statically know the string value parsed from parameter 'methods'.")]
506506
[UnconditionalSuppressMessage ("Trimming", "IL2067", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
507507
[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
508-
public void RegisterNativeMembers (
508+
public override void RegisterNativeMembers (
509509
JniType nativeClass,
510510
[DynamicallyAccessedMembers (MethodsAndPrivateNested)] Type type,
511511
ReadOnlySpan<char> methods)

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,7 @@ static Type TypeGetType (string typeName) =>
7979
JniType.GetCachedJniType (ref jniType, className);
8080

8181
ReadOnlySpan<char> methods = new ReadOnlySpan<char> ((void*) methods_ptr, methods_len);
82-
if (androidRuntime!.TypeManager is AndroidTypeManager typeManager) {
83-
// Span-based overload
84-
typeManager.RegisterNativeMembers (jniType, type, methods);
85-
} else {
86-
// String-based overload
87-
androidRuntime!.TypeManager.RegisterNativeMembers (jniType, type, methods);
88-
}
82+
androidRuntime!.TypeManager.RegisterNativeMembers (jniType, type, methods);
8983
}
9084

9185
// NOTE: should have different name than `Initialize` to avoid:

0 commit comments

Comments
 (0)