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

am 3acbf7d0: Merge "Add BinaryDictionary.flushWithGCIfHasUpdated()." 

* commit '3acbf7d00c8bf67487b3fc575df675262e5c4ede':
  Add BinaryDictionary.flushWithGCIfHasUpdated().
main
Keisuke Kuroyanagi 2014-04-22 13:17:57 +00:00 committed by Android Git Automerger
parent c1a61f4c26 3acbf7d00c
commit db9db4620f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -460,6 +460,7 @@ public final class BinaryDictionary extends Dictionary {
dictFile.length(), mIsUpdatable);
}
// Flush to dict file if the dictionary has been updated.
public void flush() {
if (!isValidDictionary()) return;
if (mHasUpdated) {
@ -468,6 +469,14 @@ public final class BinaryDictionary extends Dictionary {
}
}
// Run GC and flush to dict file if the dictionary has been updated.
public void flushWithGCIfHasUpdated() {
if (mHasUpdated) {
flushWithGC();
}
}
// Run GC and flush to dict file.
public void flushWithGC() {
if (!isValidDictionary()) return;
flushWithGCNative(mNativeDict, mDictFilePath);

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

@ -515,7 +515,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
createBinaryDictionaryLocked();
openBinaryDictionaryLocked();
loadInitialContentsLocked();
mBinaryDictionary.flushWithGC();
// Run GC and flush to file when initial contents have been loaded.
mBinaryDictionary.flushWithGCIfHasUpdated();
}
private void flushDictionaryLocked() {