summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapi/current.txt1
-rw-r--r--core/java/android/content/Intent.java11
2 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index f2340f5f8619..ce15b8655b7d 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -10185,6 +10185,7 @@ package android.content {
field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
field public static final java.lang.String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";
field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";
+ field public static final java.lang.String EXTRA_CONTENT_QUERY = "android.intent.extra.CONTENT_QUERY";
field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";
field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index e9b240448eed..10c6bc6f191c 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -5229,6 +5229,17 @@ public class Intent implements Parcelable, Cloneable {
public static final String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
/**
+ * Optional CharSequence extra to provide a search query.
+ *
+ * <p>Applicable to {@link Intent} with actions:
+ * <ul>
+ * <li>{@link Intent#ACTION_GET_CONTENT}</li>
+ * <li>{@link Intent#ACTION_OPEN_DOCUMENT}</li>
+ * </ul>
+ */
+ public static final String EXTRA_CONTENT_QUERY = "android.intent.extra.CONTENT_QUERY";
+
+ /**
* Used as an int extra field in {@link #ACTION_MEDIA_RESOURCE_GRANTED}
* intents to specify the resource type granted. Possible values are
* {@link #EXTRA_MEDIA_RESOURCE_TYPE_VIDEO_CODEC} or