commit f6c2200890012708709964fb1a8933ed1c3e7dd8
author Satoshi Kataoka <satok@google.com> Fri Aug 10 21:04:18 2012 +0900
committer Satoshi Kataoka <satok@google.com> Fri Aug 10 21:07:53 2012 +0900
tree 0c7cfd806a8473f7e203fb59262d3126811295aa
parent 0f4de30e589deba221b92b3bde341c54fd9d1b9d

Workaround to stop init dict traverse session

Change-Id: I3d46c54a96a9fc0359ef75b9d2f8590b44164a8b

java/src/com/android/inputmethod/latin/DicTraverseSession.java

diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java
index 1607528..4c36542 100644
--- a/java/src/com/android/inputmethod/latin/DicTraverseSession.java
+++ b/java/src/com/android/inputmethod/latin/DicTraverseSession.java
@@ -23,8 +23,8 @@
         JniUtils.loadNativeLibrary();
     }
     private native long setDicTraverseSessionNative(String locale);
-    private native void initDicTraverseSessionNative(long nativeDicTraverseSession,
-            long dictionary, int[] previousWord, int previwousWordLength);
+    //private native void initDicTraverseSessionNative(long nativeDicTraverseSession,
+    //long dictionary, int[] previousWord, int previousWordLength);
     private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession);
 
     private long mNativeDicTraverseSession;
@@ -43,8 +43,8 @@
     }
 
     public void initSession(long dictionary, int[] previousWord, int previousWordLength) {
-        initDicTraverseSessionNative(
-                mNativeDicTraverseSession, dictionary, previousWord, previousWordLength);
+        //initDicTraverseSessionNative(
+        //mNativeDicTraverseSession, dictionary, previousWord, previousWordLength);
     }
 
     private final long createNativeDicTraverseSession(String locale) {

native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp

diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
index 827e9f4..6ff9538 100644
--- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
+++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
@@ -22,11 +22,13 @@
 #include "jni_common.h"
 
 namespace latinime {
+class Dictionary;
 static jlong latinime_setDicTraverseSession(JNIEnv *env, jobject object, jstring localeJStr) {
     void *traverseSession = DicTraverseWrapper::getDicTraverseSession(env, localeJStr);
     return reinterpret_cast<jlong>(traverseSession);
 }
 
+#if 0
 static void latinime_initDicTraverseSession(JNIEnv *env, jobject object, jlong traverseSession,
         jlong dictionary, jintArray previousWord, jint previousWordLength) {
     void *ts = reinterpret_cast<void*>(traverseSession);
@@ -35,6 +37,7 @@
     env->GetIntArrayRegion(previousWord, 0, previousWordLength, prevWord);
     DicTraverseWrapper::initDicTraverseSession(ts, dict, prevWord, previousWordLength);
 }
+#endif
 
 static void latinime_DicTraverseSession_release(
         JNIEnv *env, jobject object, jlong traverseSession) {
@@ -44,7 +47,7 @@
 
 static JNINativeMethod sMethods[] = {
     {"setDicTraverseSessionNative", "(Ljava/lang/String;)J", (void*)latinime_setDicTraverseSession},
-    {"initDicTraverseSessionNative", "(JJ[II)V", (void*)latinime_initDicTraverseSession},
+    //{"initDicTraverseSessionNative", "(JJ[II)V", (void*)latinime_initDicTraverseSession},
     {"releaseDicTraverseSessionNative", "(J)V", (void*)latinime_DicTraverseSession_release}
 };