Merge "Pass expresslog class as parameter" into main

1 files changed, 8 insertions, 4 deletions

diff --git a/jni/expresslog/com_android_modules_expresslog_Utils.cpp b/jni/expresslog/com_android_modules_expresslog_Utils.cpp
index 973d946..ed4d0ed 100644
--- a/jni/expresslog/com_android_modules_expresslog_Utils.cpp
+++ b/jni/expresslog/com_android_modules_expresslog_Utils.cpp
@@ -48,13 +48,12 @@ static const JNINativeMethod gMethods[] = {
 
 namespace android {
 
-int register_com_android_modules_expresslog_Utils(JNIEnv* env) {
-    static const char* const kUtilsClassName = "com/android/modules/expresslog/Utils";
+int register_com_android_modules_expresslog_Utils(JNIEnv* env, const char* const utilsClassName) {
     static const char* const kStringClassName = "java/lang/String";
 
-    ScopedLocalRef<jclass> utilsCls(env, env->FindClass(kUtilsClassName));
+    ScopedLocalRef<jclass> utilsCls(env, env->FindClass(utilsClassName));
     if (utilsCls.get() == nullptr) {
-        ALOGE("jni expresslog registration failure, class not found '%s'", kUtilsClassName);
+        ALOGE("jni expresslog registration failure, class not found '%s'", utilsClassName);
         return JNI_ERR;
     }
 
@@ -78,4 +77,9 @@ int register_com_android_modules_expresslog_Utils(JNIEnv* env) {
     return JNI_VERSION_1_4;
 }
 
+int register_com_android_modules_expresslog_Utils(JNIEnv* env) {
+    static const char* const kUtilsClassName = "com/android/modules/expresslog/Utils";
+    return register_com_android_modules_expresslog_Utils(env, kUtilsClassName);
+}
+
 }  // namespace android