diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-05-02 01:15:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-02 01:15:25 +0000 |
| commit | 9cbe2ae3aeb9a73c866bfd96b34f2d8ce895ab6b (patch) | |
| tree | 65ca04d547319fdc51d338b343ea2bae280b0856 | |
| parent | fed9c11a994281feb72bd8a63e13eaa69658d3a8 (diff) | |
| parent | 9ab3fd4565c105a983c61a0598b75b81323b4437 (diff) | |
| download | frameworks_base-9cbe2ae3aeb9a73c866bfd96b34f2d8ce895ab6b.zip frameworks_base-9cbe2ae3aeb9a73c866bfd96b34f2d8ce895ab6b.tar.gz frameworks_base-9cbe2ae3aeb9a73c866bfd96b34f2d8ce895ab6b.tar.bz2 | |
Merge "Unhide extra to fix docs build."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index df9c5b8..63db84a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6202,6 +6202,7 @@ package android.content { field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT"; field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT"; field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY"; + field public static final java.lang.String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES"; field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE"; field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI"; field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 621bcee..8352635 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3236,9 +3236,8 @@ public class Intent implements Parcelable, Cloneable { /** * Extra used to communicate set of acceptable MIME types for - * {@link #ACTION_GET_CONTENT} or {@link #ACTION_OPEN_DOC}. The type of the + * {@link #ACTION_GET_CONTENT} or {@link #ACTION_OPEN_DOCUMENT}. The type of the * extra is <code>ArrayList<String></code>. - * @hide */ public static final String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES"; |