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

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

Merge "Fix NPE in FileSystemProvider." into rvc-dev am: cd051e84 am: 8b275a5f am: abe52bd3 

Change-Id: I7382ae65e528050cdecf4e8fa1cef78f4d38cc3e
parents 85096117 abe52bd3

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);

                }

            }