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

Do not crash when dictioanryInfo is NULL 

Bug: 19417599
Change-Id: I82174401c595b57b42fc74bc478b551869729ba6
main
Mohammadinamul Sheik 2015-02-24 15:45:10 -08:00
parent f7058c2a89
commit 24c282437d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
View File

@ -359,8 +359,11 @@ public class DictionaryInfoUtils {
* @param fileAddress the asset dictionary file address. * @param fileAddress the asset dictionary file address.
* @return information of the specified dictionary. * @return information of the specified dictionary.
*/ */
@Nullable
private static DictionaryInfo createDictionaryInfoFromFileAddress( private static DictionaryInfo createDictionaryInfoFromFileAddress(
final AssetFileAddress fileAddress) { final AssetFileAddress fileAddress) {
// TODO: Read the header and update the version number for the new dictionaries.
// This will make sure that the dictionary version is updated in the database.
final DictionaryHeader header = getDictionaryFileHeaderOrNull( final DictionaryHeader header = getDictionaryFileHeaderOrNull(
new File(fileAddress.mFilename), fileAddress.mOffset, fileAddress.mLength); new File(fileAddress.mFilename), fileAddress.mOffset, fileAddress.mLength);
if (header == null) { if (header == null) {
@ -436,7 +439,8 @@ public class DictionaryInfoUtils {
// Protect against cases of a less-specific dictionary being found, like an // Protect against cases of a less-specific dictionary being found, like an
// en dictionary being used for an en_US locale. In this case, the en dictionary // en dictionary being used for an en_US locale. In this case, the en dictionary
// should be used for en_US but discounted for listing purposes. // should be used for en_US but discounted for listing purposes.
if (!dictionaryInfo.mLocale.equals(locale)) { // TODO: Remove dictionaryInfo == null when the static LMs have the headers.
if (dictionaryInfo == null || !dictionaryInfo.mLocale.equals(locale)) {
continue; continue;
} }
addOrUpdateDictInfo(dictList, dictionaryInfo); addOrUpdateDictInfo(dictList, dictionaryInfo);