aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-05-15 20:20:13 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2014-05-15 20:20:13 +0900
commita545e8dd23ea270714173f564940896e9acd322e (patch)
treebc8eb799a37f10195f10ca13b929a8129f2bab6a /java
parentd94567d9637aae33905fc7f292a615996df6d3c9 (diff)
downloadlatinime-a545e8dd23ea270714173f564940896e9acd322e.tar.gz
latinime-a545e8dd23ea270714173f564940896e9acd322e.tar.xz
latinime-a545e8dd23ea270714173f564940896e9acd322e.zip
Fix: NPE when context.getFilesDir() returns null.
Bug: 14517587 Change-Id: Ib99bea14eab3a25ddb5042527b757133734a6ba6
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
index afacd085b..6ef505e76 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
+++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
@@ -138,11 +138,13 @@ public class PersonalizationHelper {
}
}
dictionaryMap.clear();
- if (!FileUtils.deleteFilteredFiles(
- context.getFilesDir(), new DictFilter(dictNamePrefix))) {
+ final File filesDir = context.getFilesDir();
+ if (filesDir == null) {
+ Log.e(TAG, "context.getFilesDir() returned null.");
+ }
+ if (!FileUtils.deleteFilteredFiles(filesDir, new DictFilter(dictNamePrefix))) {
Log.e(TAG, "Cannot remove all existing dictionary files. filesDir: "
- + context.getFilesDir().getAbsolutePath() + ", dictNamePrefix: "
- + dictNamePrefix);
+ + filesDir.getAbsolutePath() + ", dictNamePrefix: " + dictNamePrefix);
}
}
}