From 8b68b8ca2b589442e02a03005ef9344178463fe8 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Wed, 11 Mar 2020 14:10:26 +0100
Subject: [PATCH] Fix NPE in FileSystemProvider.

In case we can't get the contents of a directory.

Bug: 148836274
Test: No NPE
Change-Id: If896423f7788b614780cd7a07ffc75e25efc6ec5
---
 core/java/com/android/internal/content/FileSystemProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/content/FileSystemProvider.java b/core/java/com/android/internal/content/FileSystemProvider.java
index 73ef8c6f6fcac..2f048c95ae4e3 100644
--- 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);
                 }
             }