Hide DocumentsContract.FLAG_ARCHIVE.
The API is internal for now.
Bug: 20176812
Change-Id: I9f2c796b144906fdf4a838240c85d26f02dbe175
diff --git a/api/current.txt b/api/current.txt
index 0b204b2..41b2d3e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31661,14 +31661,13 @@
field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
field public static final java.lang.String COLUMN_SIZE = "_size";
field public static final java.lang.String COLUMN_SUMMARY = "summary";
- field public static final int FLAG_ARCHIVE = 1024; // 0x400
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
field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80
field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4
field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
- field public static final int FLAG_SUPPORTS_REMOVE = 2048; // 0x800
+ field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400
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_WRITE = 2; // 0x2
diff --git a/api/system-current.txt b/api/system-current.txt
index 909b296..10d1b04 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33968,14 +33968,13 @@
field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
field public static final java.lang.String COLUMN_SIZE = "_size";
field public static final java.lang.String COLUMN_SUMMARY = "summary";
- field public static final int FLAG_ARCHIVE = 1024; // 0x400
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
field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80
field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4
field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
- field public static final int FLAG_SUPPORTS_REMOVE = 2048; // 0x800
+ field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400
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_WRITE = 2; // 0x2
diff --git a/api/test-current.txt b/api/test-current.txt
index 86ad3e6..42bad76 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -31674,14 +31674,13 @@
field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
field public static final java.lang.String COLUMN_SIZE = "_size";
field public static final java.lang.String COLUMN_SUMMARY = "summary";
- field public static final int FLAG_ARCHIVE = 1024; // 0x400
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
field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80
field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4
field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
- field public static final int FLAG_SUPPORTS_REMOVE = 2048; // 0x800
+ field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400
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_WRITE = 2; // 0x2
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index 032d83d..8468040 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -362,6 +362,15 @@
public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 9;
/**
+ * Flag indicating that a document can be removed from a parent.
+ *
+ * @see #COLUMN_FLAGS
+ * @see DocumentsContract#removeDocument(ContentProviderClient, Uri, Uri)
+ * @see DocumentsProvider#removeDocument(String, String)
+ */
+ public static final int FLAG_SUPPORTS_REMOVE = 1 << 10;
+
+ /**
* Flag indicating that a document is an archive, and it's contents can be
* obtained via {@link DocumentsProvider#queryChildDocuments}.
* <p>
@@ -370,18 +379,10 @@
*
* @see #COLUMN_FLAGS
* @see DocumentsProvider#queryChildDocuments(String, String[], String)
+ * @hide
*/
- public static final int FLAG_ARCHIVE = 1 << 10;
- /**
- * Flag indicating that a document can be removed from a parent.
- *
- * @see #COLUMN_FLAGS
- * @see DocumentsContract#removeDocument(ContentProviderClient, Uri, Uri)
- * @see DocumentsProvider#removeDocument(String, String)
- */
- public static final int FLAG_SUPPORTS_REMOVE = 1 << 11;
-
+ public static final int FLAG_ARCHIVE = 1 << 15;
/**
* Flag indicating that document titles should be hidden when viewing
* this directory in a larger format grid. For example, a directory