Skip to content

[Mono.Android] update JNIEnv.FindClass() to use JniEnvironment.Types.FindClass() #9769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2025
Merged

[Mono.Android] update JNIEnv.FindClass() to use JniEnvironment.Types.FindClass() #9769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 2 additions & 45 deletions src/Mono.Android/Android.Runtime/JNIEnv.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,52 +280,9 @@ public static IntPtr FindClass (System.Type type)
}
}

const int nameBufferLength = 1024;
[ThreadStatic] static char[]? nameBuffer;

static unsafe IntPtr BinaryName (string classname)
public static IntPtr FindClass (string classname)
{
int index = classname.IndexOf ('/');

if (index == -1)
return NewString (classname);

int length = classname.Length;
if (length > nameBufferLength)
return NewString (classname.Replace ('/', '.'));

if (nameBuffer == null)
nameBuffer = new char[nameBufferLength];

fixed (char* src = classname, dst = nameBuffer) {
char* src_ptr = src;
char* dst_ptr = dst;
char* end_ptr = src + length;
while (src_ptr < end_ptr) {
*dst_ptr = (*src_ptr == '/') ? '.' : *src_ptr;
src_ptr++;
dst_ptr++;
}
}
return NewString (nameBuffer, length);
}

public unsafe static IntPtr FindClass (string classname)
{
JniObjectReference local_ref;

IntPtr native_str = BinaryName (classname);
try {
JniArgumentValue* parameters = stackalloc JniArgumentValue [3] {
new JniArgumentValue (native_str),
new JniArgumentValue (true),
new JniArgumentValue (JNIEnvInit.java_class_loader),
};
local_ref = JniEnvironment.StaticMethods.CallStaticObjectMethod (Java.Lang.Class.Members.JniPeerType.PeerReference, JNIEnvInit.mid_Class_forName!, parameters);
} finally {
DeleteLocalRef (native_str);
}

JniObjectReference local_ref = JniEnvironment.Types.FindClass (classname);
IntPtr global_ref = NewGlobalRef (local_ref.Handle);
JniObjectReference.Dispose (ref local_ref);
return global_ref;
Expand Down
4 changes: 0 additions & 4 deletions src/Mono.Android/Android.Runtime/JNIEnvInit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ internal struct JnienvInitializeArgs {
public IntPtr grefLoader;
public IntPtr Loader_loadClass;
public IntPtr grefClass; // TODO: remove, not needed anymore
public IntPtr Class_forName;
public uint logCategories;
public int version; // TODO: remove, not needed anymore
public int grefGcThreshold;
Expand All @@ -46,7 +45,6 @@ internal struct JnienvInitializeArgs {
internal static IntPtr grefIGCUserPeer_class;
internal static IntPtr grefGCUserPeerable_class;
internal static IntPtr java_class_loader;
internal static JniMethodInfo? mid_Class_forName;

internal static JniRuntime? androidRuntime;

Expand Down Expand Up @@ -100,8 +98,6 @@ internal static unsafe void Initialize (JnienvInitializeArgs* args)
MarshalMethodsEnabled = args->marshalMethodsEnabled;
java_class_loader = args->grefLoader;

mid_Class_forName = new JniMethodInfo (args->Class_forName, isStatic: true);

BoundExceptionType = (BoundExceptionType)args->ioExceptionType;
androidRuntime = new AndroidRuntime (args->env, args->javaVm, args->grefLoader, args->Loader_loadClass, args->jniAddNativeMethodRegistrationAttributePresent != 0);
ValueManager = androidRuntime.ValueManager;
Expand Down
1 change: 0 additions & 1 deletion src/native/mono/monodroid/monodroid-glue-internal.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ namespace xamarin::android::internal
jobject grefLoader;
jmethodID Loader_loadClass;
jclass grefClass;
jmethodID Class_forName;
unsigned int logCategories;
int version;
int grefGcThreshold;
Expand Down
1 change: 0 additions & 1 deletion src/native/mono/monodroid/monodroid-glue.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,6 @@ MonodroidRuntime::init_android_runtime (JNIEnv *env, jclass runtimeClass, jobjec

init.grefClass = RuntimeUtil::get_class_from_runtime_field (env, runtimeClass, "java_lang_Class", true);
Class_getName = env->GetMethodID (init.grefClass, "getName", "()Ljava/lang/String;");
init.Class_forName = env->GetStaticMethodID (init.grefClass, "forName", "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;");

MonoAssembly *mono_android_assembly;

Expand Down
Loading