Merge "Cleanup copyDocument and moveDocument in SAF." (7fa765a4) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -31672,6 +31672,7 @@ package android.provider {

		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;
		@@ -31679,6 +31680,7 @@ package android.provider {
		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;

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -33749,6 +33749,7 @@ package android.provider {

		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;
		@@ -33756,6 +33757,7 @@ package android.provider {
		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;

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -31685,6 +31685,7 @@ package android.provider {

		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;
		@@ -31692,6 +31693,7 @@ package android.provider {
		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;

core/java/android/provider/DocumentsProvider.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -273,7 +273,6 @@ public abstract class DocumentsProvider extends ContentProvider {
		*
		* @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)
		@@ -283,17 +282,19 @@ public abstract class DocumentsProvider extends ContentProvider {

		/**
		* 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,
		@@ -839,9 +840,6 @@ public abstract class DocumentsProvider extends ContentProvider {
		out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
		}

		// Original document no longer exists, clean up any grants.
		revokeDocumentPermission(documentId);

		} else if (METHOD_REMOVE_DOCUMENT.equals(method)) {
		final Uri parentSourceUri = extras.getParcelable(DocumentsContract.EXTRA_PARENT_URI);
		final String parentSourceId = DocumentsContract.getDocumentId(parentSourceUri);