am ef86bbce: Add const_cast to live with host\'s jni.h (50cc14b5) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -43,9 +43,12 @@ static void latinime_Keyboard_release(JNIEnv *env, jclass clazz, jlong proximity
		}

		static JNINativeMethod sMethods[] = {
		{"setProximityInfoNative", "(Ljava/lang/String;IIIII[II[I[I[I[I[I[F[F[F)J",
		{const_cast<char *>("setProximityInfoNative"),
		const_cast<char *>("(Ljava/lang/String;IIIII[II[I[I[I[I[I[F[F[F)J"),
		reinterpret_cast<void *>(latinime_Keyboard_setProximityInfo)},
		{"releaseProximityInfoNative", "(J)V", reinterpret_cast<void *>(latinime_Keyboard_release)}
		{const_cast<char *>("releaseProximityInfoNative"),
		const_cast<char *>("(J)V"),
		reinterpret_cast<void *>(latinime_Keyboard_release)}
		};

		int register_ProximityInfo(JNIEnv *env) {

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+21 −13

Original line number	Diff line number	Diff line
		@@ -280,18 +280,26 @@ static void releaseDictBuf(const void *dictBuf, const size_t length, const int f
		}

		static JNINativeMethod sMethods[] = {
		{"openNative", "(Ljava/lang/String;JJ)J",
		{const_cast<char *>("openNative"),
		const_cast<char *>("(Ljava/lang/String;JJ)J"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_open)},
		{"closeNative", "(J)V", reinterpret_cast<void *>(latinime_BinaryDictionary_close)},
		{"getSuggestionsNative", "(JJJ[I[I[I[I[IIIZ[IZ[I[I[I[I)I",
		{const_cast<char *>("closeNative"),
		const_cast<char *>("(J)V"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_close)},
		{const_cast<char *>("getSuggestionsNative"),
		const_cast<char *>("(JJJ[I[I[I[I[IIIZ[IZ[I[I[I[I)I"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_getSuggestions)},
		{"getProbabilityNative", "(J[I)I",
		{const_cast<char *>("getProbabilityNative"),
		const_cast<char *>("(J[I)I"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_getProbability)},
		{"isValidBigramNative", "(J[I[I)Z",
		{const_cast<char *>("isValidBigramNative"),
		const_cast<char *>("(J[I[I)Z"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_isValidBigram)},
		{"calcNormalizedScoreNative", "([I[II)F",
		{const_cast<char *>("calcNormalizedScoreNative"),
		const_cast<char *>("([I[II)F"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_calcNormalizedScore)},
		{"editDistanceNative", "([I[I)I",
		{const_cast<char *>("editDistanceNative"),
		const_cast<char *>("([I[I)I"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_editDistance)}
		};

native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp

+9 −6

Original line number	Diff line number	Diff line
		@@ -48,11 +48,14 @@ static void latinime_releaseDicTraverseSession(JNIEnv *env, jclass clazz, jlong
		}

		static JNINativeMethod sMethods[] = {
		{"setDicTraverseSessionNative", "(Ljava/lang/String;)J",
		{const_cast<char *>("setDicTraverseSessionNative"),
		const_cast<char *>("(Ljava/lang/String;)J"),
		reinterpret_cast<void *>(latinime_setDicTraverseSession)},
		{"initDicTraverseSessionNative", "(JJ[II)V",
		{const_cast<char *>("initDicTraverseSessionNative"),
		const_cast<char *>("(JJ[II)V"),
		reinterpret_cast<void *>(latinime_initDicTraverseSession)},
		{"releaseDicTraverseSessionNative", "(J)V",
		{const_cast<char *>("releaseDicTraverseSessionNative"),
		const_cast<char *>("(J)V"),
		reinterpret_cast<void *>(latinime_releaseDicTraverseSession)}
		};