commit 2e1abd8307a7994d0c581da321be4aedfe5a5c25
author Jeff Sharkey <jsharkey@android.com> Tue Oct 13 16:23:22 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Oct 13 16:40:24 2015 -0700
tree c4a8d0230bb79934e387dd38faf22a3150bf2f51
parent f7ccb1299e0eb3ba8086a74f92933ce4c0d3816d

Allow deletion of media through SAF.

Now that we're putting the media roots up front and center through
the Settings > Storage UI, users have an expectation of deleting
media to free up disk space.

Bug: 24450605
Change-Id: I38e1b021db2bf1f42a43f81f609818df905a0c0b

src/com/android/providers/media/MediaDocumentsProvider.java

diff --git a/src/com/android/providers/media/MediaDocumentsProvider.java b/src/com/android/providers/media/MediaDocumentsProvider.java
index 751ccd3..d099a41 100644
--- a/src/com/android/providers/media/MediaDocumentsProvider.java
+++ b/src/com/android/providers/media/MediaDocumentsProvider.java
@@ -187,6 +187,35 @@
         return projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION;
     }
 
+    private Uri getUriForDocumentId(String docId) {
+        final Ident ident = getIdentForDocId(docId);
+        if (TYPE_IMAGE.equals(ident.type) && ident.id != -1) {
+            return ContentUris.withAppendedId(
+                    Images.Media.EXTERNAL_CONTENT_URI, ident.id);
+        } else if (TYPE_VIDEO.equals(ident.type) && ident.id != -1) {
+            return ContentUris.withAppendedId(
+                    Video.Media.EXTERNAL_CONTENT_URI, ident.id);
+        } else if (TYPE_AUDIO.equals(ident.type) && ident.id != -1) {
+            return ContentUris.withAppendedId(
+                    Audio.Media.EXTERNAL_CONTENT_URI, ident.id);
+        } else {
+            throw new UnsupportedOperationException("Unsupported document " + docId);
+        }
+    }
+
+    @Override
+    public void deleteDocument(String docId) throws FileNotFoundException {
+        final Uri target = getUriForDocumentId(docId);
+
+        // Delegate to real provider
+        final long token = Binder.clearCallingIdentity();
+        try {
+            getContext().getContentResolver().delete(target, null, null);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
     @Override
     public Cursor queryRoots(String[] projection) throws FileNotFoundException {
         final MatrixCursor result = new MatrixCursor(resolveRootProjection(projection));
@@ -415,26 +444,12 @@
     @Override
     public ParcelFileDescriptor openDocument(String docId, String mode, CancellationSignal signal)
             throws FileNotFoundException {
-        final Ident ident = getIdentForDocId(docId);
+        final Uri target = getUriForDocumentId(docId);
 
         if (!"r".equals(mode)) {
             throw new IllegalArgumentException("Media is read-only");
         }
 
-        final Uri target;
-        if (TYPE_IMAGE.equals(ident.type) && ident.id != -1) {
-            target = ContentUris.withAppendedId(
-                    Images.Media.EXTERNAL_CONTENT_URI, ident.id);
-        } else if (TYPE_VIDEO.equals(ident.type) && ident.id != -1) {
-            target = ContentUris.withAppendedId(
-                    Video.Media.EXTERNAL_CONTENT_URI, ident.id);
-        } else if (TYPE_AUDIO.equals(ident.type) && ident.id != -1) {
-            target = ContentUris.withAppendedId(
-                    Audio.Media.EXTERNAL_CONTENT_URI, ident.id);
-        } else {
-            throw new UnsupportedOperationException("Unsupported document " + docId);
-        }
-
         // Delegate to real provider
         final long token = Binder.clearCallingIdentity();
         try {
@@ -609,7 +624,8 @@
         row.add(Document.COLUMN_MIME_TYPE, cursor.getString(ImageQuery.MIME_TYPE));
         row.add(Document.COLUMN_LAST_MODIFIED,
                 cursor.getLong(ImageQuery.DATE_MODIFIED) * DateUtils.SECOND_IN_MILLIS);
-        row.add(Document.COLUMN_FLAGS, Document.FLAG_SUPPORTS_THUMBNAIL);
+        row.add(Document.COLUMN_FLAGS,
+                Document.FLAG_SUPPORTS_THUMBNAIL | Document.FLAG_SUPPORTS_DELETE);
     }
 
     private interface VideosBucketQuery {
@@ -667,7 +683,8 @@
         row.add(Document.COLUMN_MIME_TYPE, cursor.getString(VideoQuery.MIME_TYPE));
         row.add(Document.COLUMN_LAST_MODIFIED,
                 cursor.getLong(VideoQuery.DATE_MODIFIED) * DateUtils.SECOND_IN_MILLIS);
-        row.add(Document.COLUMN_FLAGS, Document.FLAG_SUPPORTS_THUMBNAIL);
+        row.add(Document.COLUMN_FLAGS,
+                Document.FLAG_SUPPORTS_THUMBNAIL | Document.FLAG_SUPPORTS_DELETE);
     }
 
     private interface ArtistQuery {
@@ -736,6 +753,7 @@
         row.add(Document.COLUMN_MIME_TYPE, cursor.getString(SongQuery.MIME_TYPE));
         row.add(Document.COLUMN_LAST_MODIFIED,
                 cursor.getLong(SongQuery.DATE_MODIFIED) * DateUtils.SECOND_IN_MILLIS);
+        row.add(Document.COLUMN_FLAGS, Document.FLAG_SUPPORTS_DELETE);
     }
 
     private interface ImagesBucketThumbnailQuery {