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

am 86da47e8: Fix possible NPE in FileUtils. 

* commit '86da47e8d72f275b7f6e111930dfe205cb34423f':
  Fix possible NPE in FileUtils.
main
Keisuke Kuroyanagi 2013-12-26 22:07:20 -08:00 committed by Android Git Automerger
parent 99dfe3f273 86da47e8d7
commit 913173131e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/utils/FileUtils.java
View File

@ -25,8 +25,11 @@ import java.io.FilenameFilter;
public class FileUtils { public class FileUtils {
public static boolean deleteRecursively(final File path) { public static boolean deleteRecursively(final File path) {
if (path.isDirectory()) { if (path.isDirectory()) {
for (final File child : path.listFiles()) { final File[] files = path.listFiles();
deleteRecursively(child); if (files != null) {
for (final File child : files) {
deleteRecursively(child);
}
} }
} }
return path.delete(); return path.delete();
@ -37,6 +40,9 @@ public class FileUtils {
return false; return false;
} }
final File[] files = dir.listFiles(fileNameFilter); final File[] files = dir.listFiles(fileNameFilter);
if (files == null) {
return false;
}
boolean hasDeletedAllFiles = true; boolean hasDeletedAllFiles = true;
for (final File file : files) { for (final File file : files) {
if (!deleteRecursively(file)) { if (!deleteRecursively(file)) {