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

Commit 6b48c8ba authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 1181c5ac: Merge "Fix to follow the field naming conventions." 

* commit '1181c5ac':
  Fix to follow the field naming conventions.
parents 765179b3 1181c5ac

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

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableDictiona 
            CollectionUtils.newArrayList();



    // Should always be false except when we use this class for test

    @UsedForTesting boolean isTest = false;

    @UsedForTesting boolean mIsTest = false;



    /* package */ DynamicPredictionDictionaryBase(final Context context, final String locale,

            final SharedPreferences sp, final String dictionaryType) {
@@ -298,8 +298,8 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableDictiona 


        @Override

        protected Void doInBackground(final Void... v) {

            if (mDynamicPredictionDictionary.isTest) {

                // If isTest == true, wait until the lock is released.

            if (mDynamicPredictionDictionary.mIsTest) {

                // If mIsTest == true, wait until the lock is released.

                mDynamicPredictionDictionary.mBigramListLock.lock();

                try {

                    doWriteTaskLocked();

tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase { 
            final UserHistoryPredictionDictionary dict =

                    PersonalizationDictionaryHelper.getUserHistoryPredictionDictionary(

                            getContext(), locale, mPrefs);

            dict.isTest = true;

            dict.mIsTest = true;



            addToDict(dict, words);