Merge "Unhide findPath() API. Add JavaDoc to related features." (bdd90c8e) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32060,6 +32060,7 @@ package android.provider {
	method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);		method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);
	method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);		method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);
	method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);		method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);
			method public static java.util.List<java.lang.String> findDocumentPath(android.content.ContentResolver, android.net.Uri);
	method public static java.lang.String getDocumentId(android.net.Uri);		method public static java.lang.String getDocumentId(android.net.Uri);
	method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);		method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);
	method public static java.lang.String getRootId(android.net.Uri);		method public static java.lang.String getRootId(android.net.Uri);
	@@ -32119,12 +32120,22 @@ package android.provider {
	field public static final int FLAG_SUPPORTS_SEARCH = 8; // 0x8		field public static final int FLAG_SUPPORTS_SEARCH = 8; // 0x8
	}		}

			public static final class DocumentsContract.Path implements android.os.Parcelable {
			ctor public DocumentsContract.Path(java.lang.String, java.util.List<java.lang.String>);
			method public int describeContents();
			method public java.util.List<java.lang.String> getPath();
			method public java.lang.String getRootId();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator<android.provider.DocumentsContract.Path> CREATOR;
			}

	public abstract class DocumentsProvider extends android.content.ContentProvider {		public abstract class DocumentsProvider extends android.content.ContentProvider {
	ctor public DocumentsProvider();		ctor public DocumentsProvider();
	method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;		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 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 final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
	method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;		method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
			method public android.provider.DocumentsContract.Path findDocumentPath(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
	method public java.lang.String[] getDocumentStreamTypes(java.lang.String, java.lang.String);		method public java.lang.String[] getDocumentStreamTypes(java.lang.String, java.lang.String);
	method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;		method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;
	method public final java.lang.String getType(android.net.Uri);		method public final java.lang.String getType(android.net.Uri);

api/system-current.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34717,6 +34717,7 @@ package android.provider {
	method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);		method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);
	method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);		method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);
	method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);		method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);
			method public static java.util.List<java.lang.String> findDocumentPath(android.content.ContentResolver, android.net.Uri);
	method public static java.lang.String getDocumentId(android.net.Uri);		method public static java.lang.String getDocumentId(android.net.Uri);
	method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);		method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);
	method public static java.lang.String getRootId(android.net.Uri);		method public static java.lang.String getRootId(android.net.Uri);
	@@ -34759,6 +34760,15 @@ package android.provider {
	field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";		field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
	}		}

			public static final class DocumentsContract.Path implements android.os.Parcelable {
			ctor public DocumentsContract.Path(java.lang.String, java.util.List<java.lang.String>);
			method public int describeContents();
			method public java.util.List<java.lang.String> getPath();
			method public java.lang.String getRootId();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator<android.provider.DocumentsContract.Path> CREATOR;
			}

	public static final class DocumentsContract.Root {		public static final class DocumentsContract.Root {
	field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";		field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
	field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";		field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";
	@@ -34782,6 +34792,7 @@ package android.provider {
	method public java.lang.String createDocument(java.lang.String, 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 final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
	method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;		method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
			method public android.provider.DocumentsContract.Path findDocumentPath(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
	method public java.lang.String[] getDocumentStreamTypes(java.lang.String, java.lang.String);		method public java.lang.String[] getDocumentStreamTypes(java.lang.String, java.lang.String);
	method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;		method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;
	method public final java.lang.String getType(android.net.Uri);		method public final java.lang.String getType(android.net.Uri);

api/test-current.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32139,6 +32139,7 @@ package android.provider {
	method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);		method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);
	method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);		method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);
	method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);		method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);
			method public static java.util.List<java.lang.String> findDocumentPath(android.content.ContentResolver, android.net.Uri);
	method public static java.lang.String getDocumentId(android.net.Uri);		method public static java.lang.String getDocumentId(android.net.Uri);
	method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);		method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);
	method public static java.lang.String getRootId(android.net.Uri);		method public static java.lang.String getRootId(android.net.Uri);
	@@ -32181,6 +32182,15 @@ package android.provider {
	field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";		field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
	}		}

			public static final class DocumentsContract.Path implements android.os.Parcelable {
			ctor public DocumentsContract.Path(java.lang.String, java.util.List<java.lang.String>);
			method public int describeContents();
			method public java.util.List<java.lang.String> getPath();
			method public java.lang.String getRootId();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator<android.provider.DocumentsContract.Path> CREATOR;
			}

	public static final class DocumentsContract.Root {		public static final class DocumentsContract.Root {
	field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";		field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
	field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";		field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";
	@@ -32204,6 +32214,7 @@ package android.provider {
	method public java.lang.String createDocument(java.lang.String, 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 final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
	method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;		method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
			method public android.provider.DocumentsContract.Path findDocumentPath(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
	method public java.lang.String[] getDocumentStreamTypes(java.lang.String, java.lang.String);		method public java.lang.String[] getDocumentStreamTypes(java.lang.String, java.lang.String);
	method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;		method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;
	method public final java.lang.String getType(android.net.Uri);		method public final java.lang.String getType(android.net.Uri);

core/java/android/content/Intent.java

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3120,6 +3120,11 @@ public class Intent implements Parcelable, Cloneable {
	* URIs that can be opened with		* URIs that can be opened with
	* {@link ContentResolver#openFileDescriptor(Uri, String)}.		* {@link ContentResolver#openFileDescriptor(Uri, String)}.
	* <p>		* <p>
			* Callers can set a document URI through {@link #setData(Uri)} to indicate
			* the initial location of documents navigator. System will do its best to
			* launch the navigator in the specified document if it's a folder, or the
			* folder that contains the specified document if not.
			* <p>
	* Output: The URI of the item that was picked, returned in		* Output: The URI of the item that was picked, returned in
	* {@link #getData()}. This must be a {@code content://} URI so that any		* {@link #getData()}. This must be a {@code content://} URI so that any
	* receiver can access it. If multiple documents were selected, they are		* receiver can access it. If multiple documents were selected, they are
	@@ -3156,6 +3161,11 @@ public class Intent implements Parcelable, Cloneable {
	* URIs that can be opened with		* URIs that can be opened with
	* {@link ContentResolver#openFileDescriptor(Uri, String)}.		* {@link ContentResolver#openFileDescriptor(Uri, String)}.
	* <p>		* <p>
			* Callers can set a document URI through {@link #setData(Uri)} to indicate
			* the initial location of documents navigator. System will do its best to
			* launch the navigator in the specified document if it's a folder, or the
			* folder that contains the specified document if not.
			* <p>
	* Output: The URI of the item that was created. This must be a		* Output: The URI of the item that was created. This must be a
	* {@code content://} URI so that any receiver can access it.		* {@code content://} URI so that any receiver can access it.
	*		*
	@@ -3178,6 +3188,11 @@ public class Intent implements Parcelable, Cloneable {
	* {@link DocumentsContract#buildChildDocumentsUriUsingTree(Uri, String)}		* {@link DocumentsContract#buildChildDocumentsUriUsingTree(Uri, String)}
	* with the returned URI.		* with the returned URI.
	* <p>		* <p>
			* Callers can set a document URI through {@link #setData(Uri)} to indicate
			* the initial location of documents navigator. System will do its best to
			* initiate the navigator in the specified document if it's a folder, or
			* the folder that contains the specified document if not.
			* <p>
	* Output: The URI representing the selected directory tree.		* Output: The URI representing the selected directory tree.
	*		*
	* @see DocumentsContract		* @see DocumentsContract

core/java/android/provider/DocumentsContract.java

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1310,8 +1310,6 @@ public final class DocumentsContract {
	* @return a list of documents ID starting from the top of the tree to the		* @return a list of documents ID starting from the top of the tree to the
	* requested document, or {@code null} if failed.		* requested document, or {@code null} if failed.
	* @see DocumentsProvider#findDocumentPath(String, String)		* @see DocumentsProvider#findDocumentPath(String, String)
	*
	* {@hide}
	*/		*/
	public static List<String> findDocumentPath(ContentResolver resolver, Uri treeUri) {		public static List<String> findDocumentPath(ContentResolver resolver, Uri treeUri) {
	checkArgument(isTreeUri(treeUri), treeUri + " is not a tree uri.");		checkArgument(isTreeUri(treeUri), treeUri + " is not a tree uri.");
	@@ -1343,7 +1341,9 @@ public final class DocumentsContract {
	*		*
	* {@hide}		* {@hide}
	*/		*/
	public static Path findDocumentPath(ContentProviderClient client, Uri uri) throws RemoteException {		public static Path findDocumentPath(ContentProviderClient client, Uri uri)
			throws RemoteException {

	final Bundle in = new Bundle();		final Bundle in = new Bundle();
	in.putParcelable(DocumentsContract.EXTRA_URI, uri);		in.putParcelable(DocumentsContract.EXTRA_URI, uri);

	@@ -1393,9 +1393,8 @@ public final class DocumentsContract {
	}		}

	/**		/**
	* Holds a path from a root to a particular document under it.		* Holds a path from a document to a particular document under it. It
	*		* may also contains the root ID where the path resides.
	* @hide
	*/		*/
	public static final class Path implements Parcelable {		public static final class Path implements Parcelable {

	@@ -1406,7 +1405,7 @@ public final class DocumentsContract {
	* Creates a Path.		* Creates a Path.
	*		*
	* @param rootId the ID of the root. May be null.		* @param rootId the ID of the root. May be null.
	* @param path the list of document ids from the parent document at		* @param path the list of document ID from the parent document at
	* position 0 to the child document.		* position 0 to the child document.
	*/		*/
	public Path(@Nullable String rootId, List<String> path) {		public Path(@Nullable String rootId, List<String> path) {