diff options
| author |   Mohammadinamul Sheik <inamul@google.com> | 2015-04-03 01:16:28 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-04-03 01:16:28 +0000 |
| commit | 08bcbbb39f8d092436af30d6678e29f380e9f10a (patch) | |
| tree | ae4cf8fa14d35c6710ad6fd3150810a2f9c20e8e /java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java | |
| parent | 9be565404d3c14ae3fbfc2523782d14a5ad2cd23 (diff) | |
| parent | ceaafa2ff99fd881b5fa6053734a7e38a594638f (diff) | |
| download | latinime-08bcbbb39f8d092436af30d6678e29f380e9f10a.tar.gz latinime-08bcbbb39f8d092436af30d6678e29f380e9f10a.tar.xz latinime-08bcbbb39f8d092436af30d6678e29f380e9f10a.zip | |
am ceaafa2f: Merge "Do not throw NPE if the dictionary info is not available on db"
* commit 'ceaafa2ff99fd881b5fa6053734a7e38a594638f':
Do not throw NPE if the dictionary info is not available on db
Diffstat (limited to '')
| -rw-r--r-- | java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java b/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java index a2789cc1a..fbc899192 100644 --- a/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java +++ b/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java @@ -34,6 +34,8 @@ import java.util.LinkedList; import java.util.List; import java.util.TreeMap; +import javax.annotation.Nullable; + /** * Various helper functions for the state database */ @@ -705,6 +707,7 @@ public class MetadataDbHelper extends SQLiteOpenHelper { * @param version the word list version. * @return the metadata about this word list. */ + @Nullable public static ContentValues getContentValuesByWordListId(final SQLiteDatabase db, final String id, final int version) { final Cursor cursor = db.query(METADATA_TABLE_NAME, |