diff options
| author | Ben Kwa <kenobi@google.com> | 2015-06-10 18:30:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 18:30:31 +0000 |
| commit | c783a5e762b0c4925756b8ca273eb26aab5e7985 (patch) | |
| tree | 11ea356cae4a148928060d9cac5d0c85e286d9dc /api | |
| parent | 37d1d6d0a3c8bce69aa8dc692bd6d570b038704a (diff) | |
| parent | 77797400ec103b1691e1c3fa602c329b49ac18ca (diff) | |
| download | frameworks_base-c783a5e762b0c4925756b8ca273eb26aab5e7985.zip frameworks_base-c783a5e762b0c4925756b8ca273eb26aab5e7985.tar.gz frameworks_base-c783a5e762b0c4925756b8ca273eb26aab5e7985.tar.bz2 | |
Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 049d790..6cd3932 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26099,6 +26099,7 @@ package android.provider { method public static boolean isDocumentUri(android.content.Context, android.net.Uri); method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String); field public static final java.lang.String EXTRA_ERROR = "error"; + field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; diff --git a/api/system-current.txt b/api/system-current.txt index 8b3c181..810bed4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28029,6 +28029,7 @@ package android.provider { method public static boolean isDocumentUri(android.content.Context, android.net.Uri); method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String); field public static final java.lang.String EXTRA_ERROR = "error"; + field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF"; field public static final java.lang.String EXTRA_INFO = "info"; field public static final java.lang.String EXTRA_LOADING = "loading"; field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER"; |