summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-10-25 18:13:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-25 18:13:33 -0700
commit3ac436b758830eb938c62d5ed91caa7808b5b63e (patch)
tree4f62b479cba3094538fe0f17bff5b0fb99efd0dd /core
parent0b1ec0165a5dc98bc82670288894af446ff5bcaa (diff)
parent80f103ae12c4eb90fc2e06a6921dde2f092a181b (diff)
downloadframeworks_base-3ac436b758830eb938c62d5ed91caa7808b5b63e.zip
frameworks_base-3ac436b758830eb938c62d5ed91caa7808b5b63e.tar.gz
frameworks_base-3ac436b758830eb938c62d5ed91caa7808b5b63e.tar.bz2
am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit '80f103ae12c4eb90fc2e06a6921dde2f092a181b': Extra to always show advanced devices.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/DocumentsContract.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index 7f8dca2..09f5fe3 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -81,6 +81,9 @@ public final class DocumentsContract {
/** {@hide} */
public static final String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME";
+ /** {@hide} */
+ public static final String EXTRA_SHOW_ADVANCED = "android.content.extra.SHOW_ADVANCED";
+
/**
* Included in {@link AssetFileDescriptor#getExtras()} when returned
* thumbnail should be rotated.