Merge "Remove unused JNI global references." (9b8c5f61) · Commits · e / os / android_frameworks_base

core/jni/android_app_NativeActivity.cpp

+10 −13

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ namespace android
		{

		static struct {
		jclass clazz;

		jmethodID dispatchUnhandledKeyEvent;
		jmethodID preDispatchKeyEvent;
		jmethodID finish;
		@@ -1054,8 +1052,7 @@ static const char* const kNativeActivityPathName = "android/app/NativeActivity";

		#define FIND_CLASS(var, className) \
		var = env->FindClass(className); \
		LOG_FATAL_IF(! var, "Unable to find class %s", className); \
		var = jclass(env->NewGlobalRef(var));
		LOG_FATAL_IF(! var, "Unable to find class %s", className);

		#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor) \
		var = env->GetMethodID(clazz, methodName, fieldDescriptor); \
		@@ -1064,30 +1061,30 @@ static const char* const kNativeActivityPathName = "android/app/NativeActivity";
		int register_android_app_NativeActivity(JNIEnv* env)
		{
		//LOGD("register_android_app_NativeActivity");

		FIND_CLASS(gNativeActivityClassInfo.clazz, kNativeActivityPathName);
		jclass clazz;
		FIND_CLASS(clazz, kNativeActivityPathName);

		GET_METHOD_ID(gNativeActivityClassInfo.dispatchUnhandledKeyEvent,
		gNativeActivityClassInfo.clazz,
		clazz,
		"dispatchUnhandledKeyEvent", "(Landroid/view/KeyEvent;)Z");
		GET_METHOD_ID(gNativeActivityClassInfo.preDispatchKeyEvent,
		gNativeActivityClassInfo.clazz,
		clazz,
		"preDispatchKeyEvent", "(Landroid/view/KeyEvent;I)V");

		GET_METHOD_ID(gNativeActivityClassInfo.finish,
		gNativeActivityClassInfo.clazz,
		clazz,
		"finish", "()V");
		GET_METHOD_ID(gNativeActivityClassInfo.setWindowFlags,
		gNativeActivityClassInfo.clazz,
		clazz,
		"setWindowFlags", "(II)V");
		GET_METHOD_ID(gNativeActivityClassInfo.setWindowFormat,
		gNativeActivityClassInfo.clazz,
		clazz,
		"setWindowFormat", "(I)V");
		GET_METHOD_ID(gNativeActivityClassInfo.showIme,
		gNativeActivityClassInfo.clazz,
		clazz,
		"showIme", "(I)V");
		GET_METHOD_ID(gNativeActivityClassInfo.hideIme,
		gNativeActivityClassInfo.clazz,
		clazz,
		"hideIme", "(I)V");

		return AndroidRuntime::registerNativeMethods(

core/jni/android_content_res_Configuration.cpp

+15 −17

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@
		namespace android {

		static struct {
		jclass clazz;

		jfieldID mcc;
		jfieldID mnc;
		jfieldID locale;
		@@ -75,8 +73,7 @@ static JNINativeMethod gMethods[] = {

		#define FIND_CLASS(var, className) \
		var = env->FindClass(className); \
		LOG_FATAL_IF(! var, "Unable to find class " className); \
		var = jclass(env->NewGlobalRef(var));
		LOG_FATAL_IF(! var, "Unable to find class " className);

		#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
		var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
		@@ -84,31 +81,32 @@ static JNINativeMethod gMethods[] = {

		int register_android_content_res_Configuration(JNIEnv* env)
		{
		FIND_CLASS(gConfigurationClassInfo.clazz, "android/content/res/Configuration");
		jclass clazz;
		FIND_CLASS(clazz, "android/content/res/Configuration");

		GET_FIELD_ID(gConfigurationClassInfo.mcc, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.mcc, clazz,
		"mcc", "I");
		GET_FIELD_ID(gConfigurationClassInfo.mnc, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.mnc, clazz,
		"mnc", "I");
		GET_FIELD_ID(gConfigurationClassInfo.locale, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.locale, clazz,
		"locale", "Ljava/util/Locale;");
		GET_FIELD_ID(gConfigurationClassInfo.screenLayout, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.screenLayout, clazz,
		"screenLayout", "I");
		GET_FIELD_ID(gConfigurationClassInfo.touchscreen, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.touchscreen, clazz,
		"touchscreen", "I");
		GET_FIELD_ID(gConfigurationClassInfo.keyboard, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.keyboard, clazz,
		"keyboard", "I");
		GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, clazz,
		"keyboardHidden", "I");
		GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden, clazz,
		"hardKeyboardHidden", "I");
		GET_FIELD_ID(gConfigurationClassInfo.navigation, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.navigation, clazz,
		"navigation", "I");
		GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, clazz,
		"navigationHidden", "I");
		GET_FIELD_ID(gConfigurationClassInfo.orientation, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.orientation, clazz,
		"orientation", "I");
		GET_FIELD_ID(gConfigurationClassInfo.uiMode, gConfigurationClassInfo.clazz,
		GET_FIELD_ID(gConfigurationClassInfo.uiMode, clazz,
		"uiMode", "I");

		return AndroidRuntime::registerNativeMethods(env, "android/content/res/Configuration", gMethods,

core/jni/android_content_res_ObbScanner.cpp

+7 −8

Original line number	Diff line number	Diff line
		@@ -91,8 +91,7 @@ static JNINativeMethod gMethods[] = {

		#define FIND_CLASS(var, className) \
		var = env->FindClass(className); \
		LOG_FATAL_IF(! var, "Unable to find class " className); \
		var = jclass(env->NewGlobalRef(var));
		LOG_FATAL_IF(! var, "Unable to find class " className);

		#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
		var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
		@@ -100,15 +99,16 @@ static JNINativeMethod gMethods[] = {

		int register_android_content_res_ObbScanner(JNIEnv* env)
		{
		FIND_CLASS(gObbInfoClassInfo.clazz, "android/content/res/ObbInfo");
		jclass clazz;
		FIND_CLASS(clazz, "android/content/res/ObbInfo");

		GET_FIELD_ID(gObbInfoClassInfo.packageName, gObbInfoClassInfo.clazz,
		GET_FIELD_ID(gObbInfoClassInfo.packageName, clazz,
		"packageName", "Ljava/lang/String;");
		GET_FIELD_ID(gObbInfoClassInfo.version, gObbInfoClassInfo.clazz,
		GET_FIELD_ID(gObbInfoClassInfo.version, clazz,
		"version", "I");
		GET_FIELD_ID(gObbInfoClassInfo.flags, gObbInfoClassInfo.clazz,
		GET_FIELD_ID(gObbInfoClassInfo.flags, clazz,
		"flags", "I");
		GET_FIELD_ID(gObbInfoClassInfo.salt, gObbInfoClassInfo.clazz,
		GET_FIELD_ID(gObbInfoClassInfo.salt, clazz,
		"salt", "[B");

		return AndroidRuntime::registerNativeMethods(env, "android/content/res/ObbScanner", gMethods,
		@@ -116,4 +116,3 @@ int register_android_content_res_ObbScanner(JNIEnv* env)
		}

		}; // namespace android

core/jni/android_os_MessageQueue.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ namespace android {
		// ----------------------------------------------------------------------------

		static struct {
		jclass clazz;

		jfieldID mPtr; // native object attached to the DVM MessageQueue
		} gMessageQueueClassInfo;

		@@ -135,8 +133,7 @@ static JNINativeMethod gMessageQueueMethods[] = {

		#define FIND_CLASS(var, className) \
		var = env->FindClass(className); \
		LOG_FATAL_IF(! var, "Unable to find class " className); \
		var = jclass(env->NewGlobalRef(var));
		LOG_FATAL_IF(! var, "Unable to find class " className);

		#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
		var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
		@@ -147,9 +144,10 @@ int register_android_os_MessageQueue(JNIEnv* env) {
		gMessageQueueMethods, NELEM(gMessageQueueMethods));
		LOG_FATAL_IF(res < 0, "Unable to register native methods.");

		FIND_CLASS(gMessageQueueClassInfo.clazz, "android/os/MessageQueue");
		jclass clazz;
		FIND_CLASS(clazz, "android/os/MessageQueue");

		GET_FIELD_ID(gMessageQueueClassInfo.mPtr, gMessageQueueClassInfo.clazz,
		GET_FIELD_ID(gMessageQueueClassInfo.mPtr, clazz,
		"mPtr", "I");

		return 0;

core/jni/android_view_GLES20Canvas.cpp

+5 −6

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ using namespace uirenderer;
		// ----------------------------------------------------------------------------

		static struct {
		jclass clazz;
		jmethodID set;
		} gRectClassInfo;

		@@ -683,8 +682,7 @@ static JNINativeMethod gMethods[] = {
		#ifdef USE_OPENGL_RENDERER
		#define FIND_CLASS(var, className) \
		var = env->FindClass(className); \
		LOG_FATAL_IF(! var, "Unable to find class " className); \
		var = jclass(env->NewGlobalRef(var));
		LOG_FATAL_IF(! var, "Unable to find class " className);

		#define GET_METHOD_ID(var, clazz, methodName, methodDescriptor) \
		var = env->GetMethodID(clazz, methodName, methodDescriptor); \
		@@ -695,8 +693,9 @@ static JNINativeMethod gMethods[] = {
		#endif

		int register_android_view_GLES20Canvas(JNIEnv* env) {
		FIND_CLASS(gRectClassInfo.clazz, "android/graphics/Rect");
		GET_METHOD_ID(gRectClassInfo.set, gRectClassInfo.clazz, "set", "(IIII)V");
		jclass clazz;
		FIND_CLASS(clazz, "android/graphics/Rect");
		GET_METHOD_ID(gRectClassInfo.set, clazz, "set", "(IIII)V");

		return AndroidRuntime::registerNativeMethods(env, kClassPathName, gMethods, NELEM(gMethods));
		}