Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1cb1fa authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix NPE in FileSystemProvider." into rvc-dev am: cd051e84 am: 10d1cb6f 

Change-Id: I8b4c8fc962360c95f1b4f46c247e7c3855927dbe
parents 6ff3c294 10d1cb6f

core/java/com/android/internal/content/FileSystemProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }

            }