summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-09-05 21:19:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-05 21:19:39 +0000
commit5d7acbd8bedbccfd64d9d790d0b3c2492acdc219 (patch)
tree655735a1a22e6e81331caae8f64de3838c9f1262 /api
parente0e4197c55a8a7f6896eec2794c4cd455736e46b (diff)
parent923396b7720367ec99c889725fddfa556e703971 (diff)
downloadframeworks_base-5d7acbd8bedbccfd64d9d790d0b3c2492acdc219.zip
frameworks_base-5d7acbd8bedbccfd64d9d790d0b3c2492acdc219.tar.gz
frameworks_base-5d7acbd8bedbccfd64d9d790d0b3c2492acdc219.tar.bz2
Merge "Filter roots based on supported MIME types." into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 231f131..5b2543b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20786,17 +20786,15 @@ package android.provider {
field public static final java.lang.String COLUMN_DOCUMENT_ID = "document_id";
field public static final java.lang.String COLUMN_FLAGS = "flags";
field public static final java.lang.String COLUMN_ICON = "icon";
+ field public static final java.lang.String COLUMN_MIME_TYPES = "mime_types";
field public static final java.lang.String COLUMN_ROOT_ID = "root_id";
field public static final java.lang.String COLUMN_ROOT_TYPE = "root_type";
field public static final java.lang.String COLUMN_SUMMARY = "summary";
field public static final java.lang.String COLUMN_TITLE = "title";
field public static final int FLAG_ADVANCED = 4; // 0x4
field public static final int FLAG_LOCAL_ONLY = 2; // 0x2
- field public static final int FLAG_PROVIDES_AUDIO = 8; // 0x8
- field public static final int FLAG_PROVIDES_IMAGES = 32; // 0x20
- field public static final int FLAG_PROVIDES_VIDEO = 16; // 0x10
field public static final int FLAG_SUPPORTS_CREATE = 1; // 0x1
- field public static final int FLAG_SUPPORTS_RECENTS = 64; // 0x40
+ field public static final int FLAG_SUPPORTS_RECENTS = 8; // 0x8
field public static final int ROOT_TYPE_DEVICE = 3; // 0x3
field public static final int ROOT_TYPE_SERVICE = 1; // 0x1
field public static final int ROOT_TYPE_SHORTCUT = 2; // 0x2