From aee4b75abac61a9e2755eba27fea9d344e6ae80a Mon Sep 17 00:00:00 2001 From: Predrag Stanojevic Date: Tue, 15 May 2012 15:01:02 +0200 Subject: [PATCH] Force closed at settings application when delete Misc files NullPointerException in MiscFilesHandler.java, missing check to ensure that dir.list() does not return null. Change-Id: I13aac19949826b385610fd1fee2befb411684023 --- src/com/android/settings/deviceinfo/MiscFilesHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java index 1e0cc46059f..93e352b2e7c 100644 --- a/src/com/android/settings/deviceinfo/MiscFilesHandler.java +++ b/src/com/android/settings/deviceinfo/MiscFilesHandler.java @@ -144,8 +144,8 @@ public class MiscFilesHandler extends ListActivity { // Returns true if all deletions were successful. // If a deletion fails, the method stops attempting to delete and returns false. private boolean deleteDir(File dir) { - if (dir.isDirectory()) { - String[] children = dir.list(); + String[] children = dir.list(); + if (children != null) { for (int i=0; i < children.length; i++) { boolean success = deleteDir(new File(dir, children[i])); if (!success) { @@ -283,4 +283,4 @@ public class MiscFilesHandler extends ListActivity { return view; } } -} \ No newline at end of file +}