From a545e8dd23ea270714173f564940896e9acd322e Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Thu, 15 May 2014 20:20:13 +0900
Subject: [PATCH] Fix: NPE when context.getFilesDir() returns null.
Bug: 14517587
Change-Id: Ib99bea14eab3a25ddb5042527b757133734a6ba6
---
.../latin/personalization/PersonalizationHelper.java | 10 ++++++----
1 file 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 afacd085b7..6ef505e76c 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);
}
}
}
--
GitLab