diff options
| author | 2016-01-07 07:27:13 +0000 | |
|---|---|---|
| committer | 2016-01-07 07:27:13 +0000 | |
| commit | 76774af11097f860b95ff503de895ee3bb7724e0 (patch) | |
| tree | dfd8e5e6c5d8966885bad76a954df00ec6d9a502 | |
| parent | 4b6ac4a359cb1724bbb0f98c7a425f9fb5fd2a58 (diff) | |
| parent | 4cc43f010a1b4316d5a4015431998463b42b9fa5 (diff) | |
Merge "Revert "Revert "Update APIs for the flag changes in SAF."""
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 2338373194b8..6c639f3c0733 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30779,7 +30779,7 @@ package android.provider { 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 = 2048; // 0x800 + 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 @@ -30789,7 +30789,7 @@ package android.provider { 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 - field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400 + field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200 field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory"; } diff --git a/api/system-current.txt b/api/system-current.txt index 460e5b9c7709..6359f842fb4f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32812,7 +32812,7 @@ package android.provider { 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 = 2048; // 0x800 + 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 @@ -32822,7 +32822,7 @@ package android.provider { 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 - field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400 + field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200 field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory"; } diff --git a/api/test-current.txt b/api/test-current.txt index 5a2d48328600..9ed5a474b783 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -30791,7 +30791,7 @@ package android.provider { 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 = 2048; // 0x800 + 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 @@ -30801,7 +30801,7 @@ package android.provider { 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 - field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400 + field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200 field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory"; } |