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

Commit fbd18664 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Avoid race conditions between queries and closing of the auto_dict database. 

Keep a reference to the openhelper around across locale and input language
changes. Also, share the openhelper between the queries and updates. Creating
a new one in a separate thread could cause it to be closed at the wrong time.

Monkey bugs, probably dupes.

Bug: 2560471
Bug: 2544169
Change-Id: I6eb39145de7191732ddde455728bf147a2d1ba31
parent 06933183

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

+33 −29
Original line number Diff line number Diff line
@@ -83,13 +83,15 @@ public class AutoDictionary extends ExpandableDictionary { 
        sDictProjectionMap.put(COLUMN_LOCALE, COLUMN_LOCALE);

    }



    private DatabaseHelper mOpenHelper;

    private static DatabaseHelper mOpenHelper = null;



    public AutoDictionary(Context context, LatinIME ime, String locale) {

        super(context);

        mIme = ime;

        mLocale = locale;

        if (mOpenHelper == null) {

            mOpenHelper = new DatabaseHelper(getContext());

        }

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

            loadDictionary();

        }
@@ -104,7 +106,10 @@ public class AutoDictionary extends ExpandableDictionary { 
    @Override

    public void close() {

        flushPendingWrites();

        mOpenHelper.close();

        // Don't close the database as locale changes will require it to be reopened anyway

        // Also, the database is written to somewhat frequently, so it needs to be kept alive

        // throughout the life of the process.

        // mOpenHelper.close();

        super.close();

    }
@@ -112,6 +117,7 @@ public class AutoDictionary extends ExpandableDictionary { 
    public void loadDictionaryAsync() {

        // Load the words that correspond to the current input locale

        Cursor cursor = query(COLUMN_LOCALE + "=?", new String[] { mLocale });

        try {

            if (cursor.moveToFirst()) {

                int wordIndex = cursor.getColumnIndex(COLUMN_WORD);

                int frequencyIndex = cursor.getColumnIndex(COLUMN_FREQUENCY);
@@ -126,8 +132,10 @@ public class AutoDictionary extends ExpandableDictionary { 
                    cursor.moveToNext();

                }

            }

        } finally {

            cursor.close();

        }

    }



    @Override

    public void addWord(String word, int addFrequency) {
@@ -161,7 +169,7 @@ public class AutoDictionary extends ExpandableDictionary { 
            // Nothing pending? Return

            if (mPendingWrites.isEmpty()) return;

            // Create a background thread to write the pending entries

            new UpdateDbTask(getContext(), mPendingWrites, mLocale).execute();

            new UpdateDbTask(getContext(), mOpenHelper, mPendingWrites, mLocale).execute();

            // Create a new map for writing new entries into while the old one is written to db

            mPendingWrites = new HashMap<String, Integer>();

        }
@@ -216,11 +224,11 @@ public class AutoDictionary extends ExpandableDictionary { 
        private final DatabaseHelper mDbHelper;

        private final String mLocale;



        public UpdateDbTask(Context context,

        public UpdateDbTask(Context context, DatabaseHelper openHelper,

                HashMap<String, Integer> pendingWrites, String locale) {

            mMap = pendingWrites;

            mLocale = locale;

            mDbHelper = new DatabaseHelper(context);

            mDbHelper = openHelper;

        }



        @Override
@@ -228,7 +236,6 @@ public class AutoDictionary extends ExpandableDictionary { 
            SQLiteDatabase db = mDbHelper.getWritableDatabase();

            // Write all the entries to the db

            Set<Entry<String,Integer>> mEntries = mMap.entrySet();

            try {

            for (Entry<String,Integer> entry : mEntries) {

                Integer freq = entry.getValue();

                db.delete(AUTODICT_TABLE_NAME, COLUMN_WORD + "=? AND " + COLUMN_LOCALE + "=?",
@@ -238,9 +245,6 @@ public class AutoDictionary extends ExpandableDictionary { 
                            getContentValues(entry.getKey(), freq, mLocale));

                }

            }

            } finally {

                mDbHelper.close();

            }

            return null;

        }