aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-07-28 12:18:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-28 12:18:14 +0000
commite1d781bbbf6e03266434b33244ef9aa84dffecaf (patch)
treed0f30d8b8d89f3b85747de1674633f8c38faa7dd
parent93c58c7c61933349f9289140bdeede53252b3071 (diff)
parent4de1ca67d7340b3c2db1b7fc9262029886b3fd68 (diff)
downloadlatinime-e1d781bbbf6e03266434b33244ef9aa84dffecaf.tar.gz
latinime-e1d781bbbf6e03266434b33244ef9aa84dffecaf.tar.xz
latinime-e1d781bbbf6e03266434b33244ef9aa84dffecaf.zip
am 4de1ca67: am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
* commit '4de1ca67d7340b3c2db1b7fc9262029886b3fd68': Fix NPE when context.getFilesDir() returns null.
-rw-r--r--java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
index aac40940b..331f85e0e 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
+++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
@@ -138,6 +138,7 @@ public class PersonalizationHelper {
final File filesDir = context.getFilesDir();
if (filesDir == null) {
Log.e(TAG, "context.getFilesDir() returned null.");
+ return;
}
if (!FileUtils.deleteFilteredFiles(filesDir, new DictFilter(dictNamePrefix))) {
Log.e(TAG, "Cannot remove all existing dictionary files. filesDir: "