Remove the flag and make openTypedDocument throw FileNotFoundException. (95149ab6) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30778,7 +30778,6 @@ package android.provider {
	field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100		field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
	field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40		field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
	field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1		field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
	field public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 512; // 0x200
	field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2		field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
	field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400		field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
	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";

api/system-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32818,7 +32818,6 @@ package android.provider {
	field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100		field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
	field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40		field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
	field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1		field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
	field public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 512; // 0x200
	field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2		field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
	field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400		field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
	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";

api/test-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30781,7 +30781,6 @@ package android.provider {
	field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100		field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
	field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40		field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
	field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1		field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
	field public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 512; // 0x200
	field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2		field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
	field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400		field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
	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";

core/java/android/provider/DocumentsContract.java

+2 −12

Original line number	Original line	Diff line number	Diff line
	@@ -230,7 +230,6 @@ public final class DocumentsContract {
	* @see #FLAG_SUPPORTS_WRITE		* @see #FLAG_SUPPORTS_WRITE
	* @see #FLAG_SUPPORTS_DELETE		* @see #FLAG_SUPPORTS_DELETE
	* @see #FLAG_SUPPORTS_THUMBNAIL		* @see #FLAG_SUPPORTS_THUMBNAIL
	* @see #FLAG_SUPPORTS_TYPED_DOCUMENT
	* @see #FLAG_DIR_PREFERS_GRID		* @see #FLAG_DIR_PREFERS_GRID
	* @see #FLAG_DIR_PREFERS_LAST_MODIFIED		* @see #FLAG_DIR_PREFERS_LAST_MODIFIED
	* @see #FLAG_VIRTUAL_DOCUMENT		* @see #FLAG_VIRTUAL_DOCUMENT
	@@ -348,15 +347,6 @@ public final class DocumentsContract {
	*/		*/
	public static final int FLAG_SUPPORTS_MOVE = 1 << 8;		public static final int FLAG_SUPPORTS_MOVE = 1 << 8;

	/**
	* Flag indicating that a document can be converted to alternative types.
	*
	* @see #COLUMN_FLAGS
	* @see DocumentsProvider#openTypedDocument(String, String, Bundle,
	* android.os.CancellationSignal)
	*/
	public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 1 << 9;

	/**		/**
	* Flag indicating that a document is virtual, and doesn't have byte		* Flag indicating that a document is virtual, and doesn't have byte
	* representation in the MIME type specified as {@link #COLUMN_MIME_TYPE}.		* representation in the MIME type specified as {@link #COLUMN_MIME_TYPE}.
	@@ -366,7 +356,7 @@ public final class DocumentsContract {
	* @see DocumentsProvider#openTypedDocument(String, String, Bundle,		* @see DocumentsProvider#openTypedDocument(String, String, Bundle,
	* android.os.CancellationSignal)		* android.os.CancellationSignal)
	*/		*/
	public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 10;		public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 9;

	/**		/**
	* Flag indicating that a document is an archive, and it's contents can be		* Flag indicating that a document is an archive, and it's contents can be
	@@ -378,7 +368,7 @@ public final class DocumentsContract {
	* @see #COLUMN_FLAGS		* @see #COLUMN_FLAGS
	* @see DocumentsProvider#queryChildDocuments(String, String[], String)		* @see DocumentsProvider#queryChildDocuments(String, String[], String)
	*/		*/
	public static final int FLAG_ARCHIVE = 1 << 11;		public static final int FLAG_ARCHIVE = 1 << 10;

	/**		/**
	* Flag indicating that document titles should be hidden when viewing		* Flag indicating that document titles should be hidden when viewing

core/java/android/provider/DocumentsProvider.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -517,13 +517,12 @@ public abstract class DocumentsProvider extends ContentProvider {
	* provider.		* provider.
	* @param signal used by the caller to signal if the request should be		* @param signal used by the caller to signal if the request should be
	* cancelled. May be null.		* cancelled. May be null.
	* @see Document#FLAG_SUPPORTS_TYPED_DOCUMENT
	*/		*/
	@SuppressWarnings("unused")		@SuppressWarnings("unused")
	public AssetFileDescriptor openTypedDocument(		public AssetFileDescriptor openTypedDocument(
	String documentId, String mimeTypeFilter, Bundle opts, CancellationSignal signal)		String documentId, String mimeTypeFilter, Bundle opts, CancellationSignal signal)
	throws FileNotFoundException {		throws FileNotFoundException {
	throw new UnsupportedOperationException("Typed documents not supported");		throw new FileNotFoundException("The requested MIME type is not supported.");
	}		}

	/**		/**