commit cfd3093362e2447bca948b94ceabba404b376b4b
author Keisuke Kuroyanagi <ksk@google.com> Fri May 16 05:35:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 16 05:35:57 2014 +0000
tree 6d13925bb1452519ff6667cd6e0d17136ed1a388
parent 812d7d935aa3b6f18e49342213dd274b133687d7
parent a545e8dd23ea270714173f564940896e9acd322e

Merge "Fix: NPE when context.getFilesDir() returns null."

java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java

diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
index afacd08..6ef505e 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 @@
                 }
             }
             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);
             }
         }
     }