Merge "Fix NPE in FileSystemProvider." into rvc-dev am: cd051e846c

Change-Id: I3cd48a1b36dd95bafb98d5fac7255fe454501d89
2020-03-12 15:54:42 +00:00
parent f5c82dc343 cd051e846c
commit 8b275a5f5e
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/content/FileSystemProvider.java
+++ b/core/java/com/android/internal/content/FileSystemProvider.java
@@ -430,7 +430,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
            if (shouldHide(file)) continue;

            if (file.isDirectory()) {
-                for (File child : file.listFiles()) {
+                for (File child : FileUtils.listFilesOrEmpty(file)) {
                    pending.add(child);
                }
            }