From 88c91dd256f9ba37bdb0dbb7c81928f22e25336c Mon Sep 17 00:00:00 2001
From: Vasu Nori <vnori@google.com>
Date: Wed, 9 Mar 2011 13:46:57 -0800
Subject: bug:4081088 NPE in DownloadProvider

Change-Id: I033ba6abeed55c5ac76142c7a2e4849b8e044680
---
 src/com/android/providers/downloads/StorageManager.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/com/android/providers/downloads/StorageManager.java')

diff --git a/src/com/android/providers/downloads/StorageManager.java b/src/com/android/providers/downloads/StorageManager.java
index 72658344..ed241794 100644
--- a/src/com/android/providers/downloads/StorageManager.java
+++ b/src/com/android/providers/downloads/StorageManager.java
@@ -369,8 +369,14 @@ class StorageManager {
         }
         // get a list of all files in system cache dir and downloads data dir
         List<File> files = new ArrayList<File>();
-        files.addAll(Arrays.asList(mSystemCacheDir.listFiles()));
-        files.addAll(Arrays.asList(mDownloadDataDir.listFiles()));
+        File[] listOfFiles = mSystemCacheDir.listFiles();
+        if (listOfFiles != null) {
+            files.addAll(Arrays.asList(listOfFiles));
+        }
+        listOfFiles = mDownloadDataDir.listFiles();
+        if (listOfFiles != null) {
+            files.addAll(Arrays.asList(listOfFiles));
+        }
         if (files.size() == 0) {
             return;
         }
-- 
cgit v1.2.3