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

Commit 40a4bf7d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev... 

Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a114" into nyc-mr1-dev-plus-aosp
parents 64c147b2 ab062fc8

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ public class ExternalStorageProvider extends DocumentsProvider { 
    @Override

    public void deleteDocument(String docId) throws FileNotFoundException {

        final File file = getFileForDocId(docId);

        final File visibleFile = getFileForDocId(docId, true);



        final boolean isDirectory = file.isDirectory();

        if (isDirectory) {

            FileUtils.deleteContents(file);
@@ -492,7 +494,6 @@ public class ExternalStorageProvider extends DocumentsProvider { 
            throw new IllegalStateException("Failed to delete " + file);

        }



        final File visibleFile = getFileForDocId(docId, true);

        if (visibleFile != null) {

            final ContentResolver resolver = getContext().getContentResolver();

            final Uri externalUri = MediaStore.Files.getContentUri("external");