Merge "Don't register methods when there's nothing to register."

This commit is contained in:
Narayan Kamath
2014-03-20 10:08:37 +00:00
committed by Gerrit Code Review

View File

@@ -70,15 +70,6 @@ void android_Configuration_getFromJava(
gConfigurationClassInfo.smallestScreenWidthDp); gConfigurationClassInfo.smallestScreenWidthDp);
} }
/*
* JNI registration.
*/
static JNINativeMethod gMethods[] = {
/* name, signature, funcPtr */
//{ "getObbInfo_native", "(Ljava/lang/String;Landroid/content/res/ObbInfo;)Z",
// (void*) android_content_res_ObbScanner_getObbInfo },
};
#define FIND_CLASS(var, className) \ #define FIND_CLASS(var, className) \
var = env->FindClass(className); \ var = env->FindClass(className); \
LOG_FATAL_IF(! var, "Unable to find class " className); LOG_FATAL_IF(! var, "Unable to find class " className);
@@ -123,8 +114,7 @@ int register_android_content_res_Configuration(JNIEnv* env)
GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp, clazz, GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp, clazz,
"smallestScreenWidthDp", "I"); "smallestScreenWidthDp", "I");
return AndroidRuntime::registerNativeMethods(env, "android/content/res/Configuration", gMethods, return 0;
NELEM(gMethods));
} }
}; // namespace android }; // namespace android