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

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

Browse source 
* commit '3acbf7d00c8bf67487b3fc575df675262e5c4ede':
  Add BinaryDictionary.flushWithGCIfHasUpdated().
This commit is contained in:
Keisuke Kuroyanagi 2014-04-22 13:17:57 +00:00 committed by Android Git Automerger
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); dictFile.length(), mIsUpdatable);
} }
// Flush to dict file if the dictionary has been updated.
public void flush() { public void flush() {
if (!isValidDictionary()) return; if (!isValidDictionary()) return;
if (mHasUpdated) { 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() { public void flushWithGC() {
if (!isValidDictionary()) return; if (!isValidDictionary()) return;
flushWithGCNative(mNativeDict, mDictFilePath); 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(); createBinaryDictionaryLocked();
openBinaryDictionaryLocked(); openBinaryDictionaryLocked();
loadInitialContentsLocked(); loadInitialContentsLocked();
mBinaryDictionary.flushWithGC(); // Run GC and flush to file when initial contents have been loaded.
mBinaryDictionary.flushWithGCIfHasUpdated();
} }
private void flushDictionaryLocked() { private void flushDictionaryLocked() {