am 1d4cd879: am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")." (2f3f86c1) · Commits · e / os / android_frameworks_base

core/jni/android_util_AssetManager.cpp

+3 −15

Original line number	Diff line number	Diff line
		@@ -293,17 +293,10 @@ static jobjectArray android_content_AssetManager_list(JNIEnv* env, jobject clazz
		return NULL;
		}

		jclass cls = env->FindClass("java/lang/String");
		LOG_FATAL_IF(cls == NULL, "No string class?!?");
		if (cls == NULL) {
		delete dir;
		return NULL;
		}

		size_t N = dir->getFileCount();

		jobjectArray array = env->NewObjectArray(dir->getFileCount(),
		cls, NULL);
		g_stringClass, NULL);
		if (array == NULL) {
		delete dir;
		return NULL;
		@@ -1459,19 +1452,13 @@ static jobjectArray android_content_AssetManager_getArrayStringResource(JNIEnv*
		}
		const ResTable& res(am->getResources());

		jclass cls = env->FindClass("java/lang/String");
		LOG_FATAL_IF(cls == NULL, "No string class?!?");
		if (cls == NULL) {
		return NULL;
		}

		const ResTable::bag_entry* startOfBag;
		const ssize_t N = res.lockBag(arrayResId, &startOfBag);
		if (N < 0) {
		return NULL;
		}

		jobjectArray array = env->NewObjectArray(N, cls, NULL);
		jobjectArray array = env->NewObjectArray(N, g_stringClass, NULL);
		if (env->ExceptionCheck()) {
		res.unlockBag(startOfBag);
		return NULL;
		@@ -1768,6 +1755,7 @@ int register_android_content_AssetManager(JNIEnv* env)
		jclass stringClass = env->FindClass("java/lang/String");
		LOG_FATAL_IF(stringClass == NULL, "Unable to find class java/lang/String");
		g_stringClass = (jclass)env->NewGlobalRef(stringClass);
		LOG_FATAL_IF(g_stringClass == NULL, "Unable to create global reference for class java/lang/String");

		return AndroidRuntime::registerNativeMethods(env,
		"android/content/res/AssetManager", gAssetManagerMethods, NELEM(gAssetManagerMethods));