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

Commit 0ca2f2a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update FLAG_DIR_BLOCK_TREE to FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE"

parents 01cfbacc 84b55928

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39066,7 +39066,7 @@ package android.provider { 
    field public static final String COLUMN_MIME_TYPE = "mime_type";

    field public static final String COLUMN_SIZE = "_size";

    field public static final String COLUMN_SUMMARY = "summary";

    field public static final int FLAG_DIR_BLOCKS_TREE = 32768; // 0x8000

    field public static final int FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE = 32768; // 0x8000

    field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10

    field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20

    field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8

core/java/android/provider/DocumentsContract.java

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ public final class DocumentsContract { 
         * <p>

         * Type: INTEGER (int)

         *

         * @see #FLAG_DIR_BLOCKS_TREE

         * @see #FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE

         * @see #FLAG_DIR_PREFERS_GRID

         * @see #FLAG_DIR_PREFERS_LAST_MODIFIED

         * @see #FLAG_DIR_SUPPORTS_CREATE
@@ -567,7 +567,7 @@ public final class DocumentsContract { 
         * @see Intent#ACTION_OPEN_DOCUMENT_TREE

         * @see #COLUMN_FLAGS

         */

        public static final int FLAG_DIR_BLOCKS_TREE = 1 << 15;

        public static final int FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE = 1 << 15;

    }



    /**

core/java/com/android/internal/content/FileSystemProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ public abstract class FileSystemProvider extends DocumentsProvider { 
                    flags |= Document.FLAG_SUPPORTS_MOVE;



                    if (shouldBlockFromTree(docId)) {

                        flags |= Document.FLAG_DIR_BLOCKS_TREE;

                        flags |= Document.FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE;

                    }



                } else {