nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1ffb7cd4: Merge "Debug log when failed to add/remove n-gram entry." 

* commit '1ffb7cd4481bb7ea6d364a26e658d0b930dd3a1b':
  Debug log when failed to add/remove n-gram entry.
main
Keisuke Kuroyanagi 2014-06-10 05:17:35 +00:00 committed by Android Git Automerger
parent 307d316f19 1ffb7cd448
commit 61ce0c7ef0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
View File

@ -49,6 +49,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
* queries in native code. This binary dictionary is written to internal storage. * queries in native code. This binary dictionary is written to internal storage.
*/ */
abstract public class ExpandableBinaryDictionary extends Dictionary { abstract public class ExpandableBinaryDictionary extends Dictionary {
private static final boolean DEBUG = false;
/** Used for Log actions from this class */ /** Used for Log actions from this class */
private static final String TAG = ExpandableBinaryDictionary.class.getSimpleName(); private static final String TAG = ExpandableBinaryDictionary.class.getSimpleName();
@ -325,16 +326,17 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
protected void addNgramEntryLocked(final PrevWordsInfo prevWordsInfo, final String word, protected void addNgramEntryLocked(final PrevWordsInfo prevWordsInfo, final String word,
final int frequency, final int timestamp) { final int frequency, final int timestamp) {
if (!mBinaryDictionary.addNgramEntry(prevWordsInfo, word, frequency, timestamp)) { if (!mBinaryDictionary.addNgramEntry(prevWordsInfo, word, frequency, timestamp)) {
Log.e(TAG, "Cannot add n-gram entry."); if (DEBUG) {
Log.e(TAG, " PrevWordsInfo: " + prevWordsInfo); Log.i(TAG, "Cannot add n-gram entry.");
Log.e(TAG, " word: " + word); Log.i(TAG, " PrevWordsInfo: " + prevWordsInfo + ", word: " + word);
}
} }
} }
/** /**
* Dynamically remove the n-gram entry in the dictionary. * Dynamically remove the n-gram entry in the dictionary.
*/ */
public void removeNgramDynamically(final PrevWordsInfo prevWordsInfo, final String word1) { public void removeNgramDynamically(final PrevWordsInfo prevWordsInfo, final String word) {
reloadDictionaryIfRequired(); reloadDictionaryIfRequired();
asyncExecuteTaskWithWriteLock(new Runnable() { asyncExecuteTaskWithWriteLock(new Runnable() {
@Override @Override
@ -343,7 +345,12 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
return; return;
} }
runGCIfRequiredLocked(true /* mindsBlockByGC */); runGCIfRequiredLocked(true /* mindsBlockByGC */);
mBinaryDictionary.removeNgramEntry(prevWordsInfo, word1); if (!mBinaryDictionary.removeNgramEntry(prevWordsInfo, word)) {
if (DEBUG) {
Log.i(TAG, "Cannot remove n-gram entry.");
Log.i(TAG, " PrevWordsInfo: " + prevWordsInfo + ", word: " + word);
}
}
} }
}); });
} }