Commit 26cd22b2 authored by Ryan Pavlik's avatar Ryan Pavlik

a/android: Move class name to a constant.

parent da3959e6
Pipeline #220091 passed with stages
in 5 minutes and 21 seconds
...@@ -33,6 +33,9 @@ struct android_custom_surface ...@@ -33,6 +33,9 @@ struct android_custom_surface
jni::method_t waitGetSurfaceHolderMethod; jni::method_t waitGetSurfaceHolderMethod;
}; };
constexpr auto FULLY_QUALIFIED_CLASSNAME =
"org.freedesktop.monado.auxiliary.MonadoView";
struct android_custom_surface * struct android_custom_surface *
android_custom_surface_async_start(struct _JavaVM *vm, void *activity) android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
{ {
...@@ -51,14 +54,12 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity) ...@@ -51,14 +54,12 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
return nullptr; return nullptr;
} }
auto clazz = loadClassFromPackage( auto clazz = loadClassFromPackage(info, (jobject)activity,
info, (jobject)activity, FULLY_QUALIFIED_CLASSNAME);
"org.freedesktop.monado.auxiliary.MonadoView");
if (clazz.isNull()) { if (clazz.isNull()) {
U_LOG_E("Could not load class '%s' from package '%s'", U_LOG_E("Could not load class '%s' from package '%s'",
"org.freedesktop.monado.auxiliary.MonadoView", FULLY_QUALIFIED_CLASSNAME, XRT_ANDROID_PACKAGE);
XRT_ANDROID_PACKAGE);
return nullptr; return nullptr;
} }
...@@ -73,8 +74,7 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity) ...@@ -73,8 +74,7 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
} }
std::string clazz_name = ret->monadoViewClass.getName(); std::string clazz_name = ret->monadoViewClass.getName();
if (clazz_name != if (clazz_name != FULLY_QUALIFIED_CLASSNAME) {
"org.freedesktop.monado.auxiliary.MonadoView") {
U_LOG_E("Unexpected class name: %s", U_LOG_E("Unexpected class name: %s",
clazz_name.c_str()); clazz_name.c_str());
return nullptr; return nullptr;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment