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

Commit 10d1cb6f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I0d87b3e106a5c4121159d7523085513a5d53372e
parents 937c2abe cd051e84

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -430,7 +430,7 @@ public abstract class FileSystemProvider extends DocumentsProvider { 
            if (shouldHide(file)) continue;

            if (shouldHide(file)) continue;





            if (file.isDirectory()) {

            if (file.isDirectory()) {

                for (File child : file.listFiles()) {

                for (File child : FileUtils.listFilesOrEmpty(file)) {

                    pending.add(child);

                    pending.add(child);

                }

                }

            }

            }