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

Commit 813f9e83 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Use visible paths when cleaning up MediaStore. 

The media scanner always records visible paths, so we need to use
visible paths when cleaning up deleted records.

Bug: 28581384
Change-Id: I8a2c65001216e4a96b2375579363a771de782bcc
parent e7d21d84

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

+17 −14
Original line number Diff line number Diff line
@@ -492,24 +492,27 @@ 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");



            // Remove media store entries for any files inside this directory, using

            // path prefix match. Logic borrowed from MtpDatabase.

            if (isDirectory) {

            final String path = file.getAbsolutePath() + "/";

                final String path = visibleFile.getAbsolutePath() + "/";

                resolver.delete(externalUri,

                        "_data LIKE ?1 AND lower(substr(_data,1,?2))=lower(?3)",

                        new String[] { path + "%", Integer.toString(path.length()), path });

            }



            // Remove media store entry for this exact file.

        final String path = file.getAbsolutePath();

            final String path = visibleFile.getAbsolutePath();

            resolver.delete(externalUri,

                    "_data LIKE ?1 AND lower(_data)=lower(?2)",

                    new String[] { path, path });

        }

    }



    @Override

    public String moveDocument(String sourceDocumentId, String sourceParentDocumentId,