Cleanup copyDocument and moveDocument in SAF.
1. Unhide the methods in DocumentsProvider.
2. Stop revoking grants, as we shouldn't do that if the documentId doesn't
change. Note, we could have an if checking if the ID changed then revoke
in call(), but it would be racey, as another file with the same ID might
have been created in the meantime on another thread.
Change-Id: Ia99853bf11cf416e0b8c0a0e63458dcc09564da9
diff --git a/api/current.txt b/api/current.txt
index 1bf982a..a32df74 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31158,6 +31158,7 @@
public abstract class DocumentsProvider extends android.content.ContentProvider {
ctor public DocumentsProvider();
+ method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
@@ -31165,6 +31166,7 @@
method public final java.lang.String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public java.lang.String moveDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
diff --git a/api/system-current.txt b/api/system-current.txt
index c1e14ab..abe16c4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33272,6 +33272,7 @@
public abstract class DocumentsProvider extends android.content.ContentProvider {
ctor public DocumentsProvider();
+ method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
@@ -33279,6 +33280,7 @@
method public final java.lang.String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public java.lang.String moveDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
diff --git a/api/test-current.txt b/api/test-current.txt
index 6af0596..c42bc86 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -31170,6 +31170,7 @@
public abstract class DocumentsProvider extends android.content.ContentProvider {
ctor public DocumentsProvider();
+ method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
@@ -31177,6 +31178,7 @@
method public final java.lang.String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public java.lang.String moveDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java
index bae928d..97edf69 100644
--- a/core/java/android/provider/DocumentsProvider.java
+++ b/core/java/android/provider/DocumentsProvider.java
@@ -272,7 +272,6 @@
*
* @param sourceDocumentId the document to copy.
* @param targetParentDocumentId the target document to be copied into as a child.
- * @hide
*/
@SuppressWarnings("unused")
public String copyDocument(String sourceDocumentId, String targetParentDocumentId)
@@ -282,17 +281,19 @@
/**
* Move the requested document or a document tree.
- * <p>
- * Moves a document including all child documents to another location within
+ *
+ * <p>Moves a document including all child documents to another location within
* the same document provider. Upon completion returns the document id of
* the copied document at the target destination. {@code null} must never
* be returned.
*
+ * <p>It's the responsibility of the provider to revoke grants if the document
+ * is no longer accessible using <code>sourceDocumentId</code>.
+ *
* @param sourceDocumentId the document to move.
* @param sourceParentDocumentId the parent of the document to move.
* @param targetParentDocumentId the target document to be a new parent of the
* source document.
- * @hide
*/
@SuppressWarnings("unused")
public String moveDocument(String sourceDocumentId, String sourceParentDocumentId,
@@ -819,9 +820,6 @@
out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
}
- // Original document no longer exists, clean up any grants.
- revokeDocumentPermission(documentId);
-
} else {
throw new UnsupportedOperationException("Method not supported " + method);
}