summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-05-02 00:46:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-02 00:46:46 +0000
commit037db6cfd0f324cf17a2e122891bc296007452a0 (patch)
tree0b8f62ad79578eb6f9bb17efe264f8abb47ce008 /core/java
parent863b117a3a90d496656094dbb63e1d2c30d47642 (diff)
parent9e0036ed7d3260d79cc5f9ffd8e3bbe760699924 (diff)
downloadframeworks_base-037db6cfd0f324cf17a2e122891bc296007452a0.zip
frameworks_base-037db6cfd0f324cf17a2e122891bc296007452a0.tar.gz
frameworks_base-037db6cfd0f324cf17a2e122891bc296007452a0.tar.bz2
Merge "External storage provider, document picker UI."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/DocumentsContract.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index e10ead9..c26f6d4 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -25,7 +25,6 @@ import android.graphics.BitmapFactory;
import android.graphics.Point;
import android.net.Uri;
import android.os.Bundle;
-import android.os.SystemClock;
import android.util.Log;
import libcore.io.IoUtils;
@@ -52,6 +51,9 @@ public final class DocumentsContract {
*/
public static final String MIME_TYPE_DIRECTORY = "vnd.android.cursor.dir/doc";
+ /** {@hide} */
+ public static final String META_DATA_DOCUMENT_PROVIDER = "android.content.DOCUMENT_PROVIDER";
+
/**
* {@link DocumentColumns#GUID} value representing the root directory of a
* storage backend.