From 26cd22b23231e5cf5f1543f05c74c47722f9132d Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 28 Oct 2020 11:49:56 -0500 Subject: [PATCH] a/android: Move class name to a constant. --- .../auxiliary/android/android_custom_surface.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xrt/auxiliary/android/android_custom_surface.cpp b/src/xrt/auxiliary/android/android_custom_surface.cpp index 0cfd46a55..452b546fe 100644 --- a/src/xrt/auxiliary/android/android_custom_surface.cpp +++ b/src/xrt/auxiliary/android/android_custom_surface.cpp @@ -33,6 +33,9 @@ struct android_custom_surface jni::method_t waitGetSurfaceHolderMethod; }; +constexpr auto FULLY_QUALIFIED_CLASSNAME = + "org.freedesktop.monado.auxiliary.MonadoView"; + struct android_custom_surface * 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; } - auto clazz = loadClassFromPackage( - info, (jobject)activity, - "org.freedesktop.monado.auxiliary.MonadoView"); + auto clazz = loadClassFromPackage(info, (jobject)activity, + FULLY_QUALIFIED_CLASSNAME); if (clazz.isNull()) { U_LOG_E("Could not load class '%s' from package '%s'", - "org.freedesktop.monado.auxiliary.MonadoView", - XRT_ANDROID_PACKAGE); + FULLY_QUALIFIED_CLASSNAME, XRT_ANDROID_PACKAGE); return nullptr; } @@ -73,8 +74,7 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity) } std::string clazz_name = ret->monadoViewClass.getName(); - if (clazz_name != - "org.freedesktop.monado.auxiliary.MonadoView") { + if (clazz_name != FULLY_QUALIFIED_CLASSNAME) { U_LOG_E("Unexpected class name: %s", clazz_name.c_str()); return nullptr;