Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b931719 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski
Browse files

Revert "Remove the flag and make openTypedDocument throw FileNotFoundException." 

This reverts commit 95149ab6.

Change-Id: I218aa8059ef674400dac8531a86cd326748c26d5
parent 95149ab6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30778,6 +30778,7 @@ package android.provider { 
    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_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_VIRTUAL_DOCUMENT = 1024; // 0x400

    field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32818,6 +32818,7 @@ package android.provider { 
    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_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_VIRTUAL_DOCUMENT = 1024; // 0x400

    field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30781,6 +30781,7 @@ package android.provider { 
    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_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_VIRTUAL_DOCUMENT = 1024; // 0x400

    field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";

core/java/android/provider/DocumentsContract.java

+12 −2
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ public final class DocumentsContract { 
         * @see #FLAG_SUPPORTS_WRITE

         * @see #FLAG_SUPPORTS_DELETE

         * @see #FLAG_SUPPORTS_THUMBNAIL

         * @see #FLAG_SUPPORTS_TYPED_DOCUMENT

         * @see #FLAG_DIR_PREFERS_GRID

         * @see #FLAG_DIR_PREFERS_LAST_MODIFIED

         * @see #FLAG_VIRTUAL_DOCUMENT
@@ -347,6 +348,15 @@ public final class DocumentsContract { 
         */

        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

         * representation in the MIME type specified as {@link #COLUMN_MIME_TYPE}.
@@ -356,7 +366,7 @@ public final class DocumentsContract { 
         * @see DocumentsProvider#openTypedDocument(String, String, Bundle,

         *      android.os.CancellationSignal)

         */

        public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 9;

        public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 10;



        /**

         * Flag indicating that a document is an archive, and it's contents can be
@@ -368,7 +378,7 @@ public final class DocumentsContract { 
         * @see #COLUMN_FLAGS

         * @see DocumentsProvider#queryChildDocuments(String, String[], String)

         */

        public static final int FLAG_ARCHIVE = 1 << 10;

        public static final int FLAG_ARCHIVE = 1 << 11;



        /**

         * Flag indicating that document titles should be hidden when viewing

core/java/android/provider/DocumentsProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -517,12 +517,13 @@ public abstract class DocumentsProvider extends ContentProvider { 
     *            provider.

     * @param signal used by the caller to signal if the request should be

     *            cancelled. May be null.

     * @see Document#FLAG_SUPPORTS_TYPED_DOCUMENT

     */

    @SuppressWarnings("unused")

    public AssetFileDescriptor openTypedDocument(

            String documentId, String mimeTypeFilter, Bundle opts, CancellationSignal signal)

            throws FileNotFoundException {

        throw new FileNotFoundException("The requested MIME type is not supported.");

        throw new UnsupportedOperationException("Typed documents not supported");

    }



    /**