summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2019-01-30 07:47:48 -0800
committerSudheer Shanka <sudheersai@google.com>2019-01-30 10:31:09 -0800
commit81db9aa6cc8942fb1d40dcada0c44eb5332bc81e (patch)
tree925b26e4b4012fdced69902b5b5d1c6623332c06 /src
parentb8a29fe1197577062843960c3fb85f6307279dca (diff)
downloadandroid_packages_providers_DownloadProvider-81db9aa6cc8942fb1d40dcada0c44eb5332bc81e.tar.gz
android_packages_providers_DownloadProvider-81db9aa6cc8942fb1d40dcada0c44eb5332bc81e.tar.bz2
android_packages_providers_DownloadProvider-81db9aa6cc8942fb1d40dcada0c44eb5332bc81e.zip
Fix NPE in DownloadStorageProvider.
Android/sandbox dir is not available on devices with isolated_storage flag disabled. Bug: 123613559 Test: manual Change-Id: Iaed734f9068c8089a34816936dc07ff0ff91ee03
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/downloads/DownloadStorageProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java
index 458cbf4f..bd031158 100644
--- a/src/com/android/providers/downloads/DownloadStorageProvider.java
+++ b/src/com/android/providers/downloads/DownloadStorageProvider.java
@@ -759,7 +759,7 @@ public class DownloadStorageProvider extends FileSystemProvider {
final int size = downloadsDirs.size();
for (int i = 0; i < size; ++i) {
final File downloadsDir = downloadsDirs.get(i);
- for (File file : downloadsDir.listFiles()) {
+ for (File file : FileUtils.listFilesOrEmpty(downloadsDir)) {
boolean inResultsAlready = downloadedFilePaths.contains(file.getAbsolutePath());
boolean containsQuery = searchString == null || file.getName().contains(
searchString);
@@ -774,7 +774,7 @@ public class DownloadStorageProvider extends FileSystemProvider {
final List<File> downloadsDirectories = new ArrayList<>();
downloadsDirectories.add(getTopLevelDownloadsDirectory());
final File sandboxDir = Environment.buildExternalStorageAndroidSandboxDirs()[0];
- for (File file : sandboxDir.listFiles()) {
+ for (File file : FileUtils.listFilesOrEmpty(sandboxDir)) {
final File downloadDir = new File(file, Environment.DIRECTORY_DOWNLOADS);
if (downloadDir.exists()) {
downloadsDirectories.add(downloadDir);