From 81db9aa6cc8942fb1d40dcada0c44eb5332bc81e Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 30 Jan 2019 07:47:48 -0800 Subject: Fix NPE in DownloadStorageProvider. Android/sandbox dir is not available on devices with isolated_storage flag disabled. Bug: 123613559 Test: manual Change-Id: Iaed734f9068c8089a34816936dc07ff0ff91ee03 --- src/com/android/providers/downloads/DownloadStorageProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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 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); -- cgit v1.2.3