summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-09-26 13:40:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-26 13:40:34 -0700
commit9f68c104249984b2c8d35b13399ac23606cc0acc (patch)
tree7546b31ba5ec60a8bdcf2be703962cb6f811ff87 /api
parent922e46ae9a895171bf034e97fa2415a7e27c5395 (diff)
parent66ee877f5d27b4dd4081702ad216359971e1b8b3 (diff)
downloadframeworks_base-9f68c104249984b2c8d35b13399ac23606cc0acc.zip
frameworks_base-9f68c104249984b2c8d35b13399ac23606cc0acc.tar.gz
frameworks_base-9f68c104249984b2c8d35b13399ac23606cc0acc.tar.bz2
am 66ee877f: am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev
* commit '66ee877f5d27b4dd4081702ad216359971e1b8b3': Tighten flags enforcement, API to test Uris.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 8dfcced..f02083a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21041,6 +21041,7 @@ package android.provider {
method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);
method public static java.lang.String getRootId(android.net.Uri);
method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);
+ method public static boolean isDocumentUri(android.content.Context, android.net.Uri);
field public static final java.lang.String EXTRA_ERROR = "error";
field public static final java.lang.String EXTRA_INFO = "info";
field public static final java.lang.String EXTRA_LOADING = "loading";