aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-04-22 17:07:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-22 17:07:16 +0000
commit68b4f2ada9f0208084dca130b59f0a9f2a37ecf6 (patch)
tree648a2017f4bacbc01ba60563dd29fc501b14bb80
parentcfdeb9b04bd1646e97973823fd9d4fb5dee09681 (diff)
parent61cb852d336543f120a9fa51fc40dda6b639da39 (diff)
downloadlatinime-68b4f2ada9f0208084dca130b59f0a9f2a37ecf6.tar.gz
latinime-68b4f2ada9f0208084dca130b59f0a9f2a37ecf6.tar.xz
latinime-68b4f2ada9f0208084dca130b59f0a9f2a37ecf6.zip
Merge "Add jni interface to use on memory dictionary."
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionary.java2
-rw-r--r--native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp12
2 files changed, 14 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 38359fc15..a351ee974 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -151,6 +151,8 @@ public final class BinaryDictionary extends Dictionary {
private static native long openNative(String sourceDir, long dictOffset, long dictSize,
boolean isUpdatable);
+ private static native long createOnMemoryNative(long formatVersion,
+ String locale, String[] attributeKeyStringArray, String[] attributeValueStringArray);
private static native void getHeaderInfoNative(long dict, int[] outHeaderSize,
int[] outFormatVersion, ArrayList<int[]> outAttributeKeys,
ArrayList<int[]> outAttributeValues);
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 0cb66146f..b2946da9c 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -65,6 +65,13 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
return reinterpret_cast<jlong>(dictionary);
}
+static jlong latinime_BinaryDictionary_createOnMemory(JNIEnv *env, jclass clazz,
+ jlong formatVersion, jstring locale, jobjectArray attributeKeyStringArray,
+ jobjectArray attributeValueStringArray) {
+ // TODO: Implement.
+ return 0;
+}
+
static void latinime_BinaryDictionary_flush(JNIEnv *env, jclass clazz, jlong dict,
jstring filePath) {
Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict);
@@ -468,6 +475,11 @@ static const JNINativeMethod sMethods[] = {
reinterpret_cast<void *>(latinime_BinaryDictionary_open)
},
{
+ const_cast<char *>("createOnMemoryNative"),
+ const_cast<char *>("(JLjava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)J"),
+ reinterpret_cast<void *>(latinime_BinaryDictionary_createOnMemory)
+ },
+ {
const_cast<char *>("closeNative"),
const_cast<char *>("(J)V"),
reinterpret_cast<void *>(latinime_BinaryDictionary_close)