diff options
| author | Vasu Nori <vnori@google.com> | 2011-03-09 16:24:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-09 16:24:12 -0800 |
| commit | 096392477351cb3179f1a788477fd9f72d062eca (patch) | |
| tree | 76e82db7322e1f054b08ee8a85b069af57834868 | |
| parent | 81101942f55ae76824d244ef0cbf579fb84922fe (diff) | |
| parent | 88c91dd256f9ba37bdb0dbb7c81928f22e25336c (diff) | |
| download | android_packages_providers_DownloadProvider-096392477351cb3179f1a788477fd9f72d062eca.tar.gz android_packages_providers_DownloadProvider-096392477351cb3179f1a788477fd9f72d062eca.tar.bz2 android_packages_providers_DownloadProvider-096392477351cb3179f1a788477fd9f72d062eca.zip | |
Merge "bug:4081088 NPE in DownloadProvider" into honeycomb-mr1
| -rw-r--r-- | src/com/android/providers/downloads/StorageManager.java | 10 |
1 files changed, 8 insertions, 2 deletions
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; } |