Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef073f40 authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Use PrioritizedSerialExecutor instead of ReentrantReadWriteLock. 

Change-Id: I003b769e408ebd692085a7e17fed6d9396876202
parent 40e91e45

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

+185 −241

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ public final class SynchronouslyLoadedContactsBinaryDictionary extends ContactsB 
    public synchronized ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer codes,

            final String prevWordForBigrams, final ProximityInfo proximityInfo,

            final boolean blockOffensiveWords, final int[] additionalFeaturesOptions) {

        syncReloadDictionaryIfRequired();

        reloadDictionaryIfRequired();

        return super.getSuggestions(codes, prevWordForBigrams, proximityInfo, blockOffensiveWords,

                additionalFeaturesOptions);

    }



    @Override

    public synchronized boolean isValidWord(final String word) {

        syncReloadDictionaryIfRequired();

        reloadDictionaryIfRequired();

        return isValidWordInner(word);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDic 
    public synchronized ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer codes,

            final String prevWordForBigrams, final ProximityInfo proximityInfo,

            final boolean blockOffensiveWords, final int[] additionalFeaturesOptions) {

        syncReloadDictionaryIfRequired();

        reloadDictionaryIfRequired();

        return super.getSuggestions(codes, prevWordForBigrams, proximityInfo, blockOffensiveWords,

                additionalFeaturesOptions);

    }



    @Override

    public synchronized boolean isValidWord(final String word) {

        syncReloadDictionaryIfRequired();

        reloadDictionaryIfRequired();

        return isValidWordInner(word);

    }

}

java/src/com/android/inputmethod/latin/personalization/DynamicPredictionDictionaryBase.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableBinaryDi 
        mPrefs = sp;

        if (mLocale != null && mLocale.length() > 1) {

            asyncLoadDictionaryToMemory();

            asyncReloadDictionaryIfRequired();

            reloadDictionaryIfRequired();

        }

    }

java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class PersonalizationHelper { 
                    if (DEBUG) {

                        Log.w(TAG, "Use cached UserHistoryPredictionDictionary for " + locale);

                    }

                    dict.asyncReloadDictionaryIfRequired();

                    dict.reloadDictionaryIfRequired();

                    return dict;

                }

            }