Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cbe2ae3 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Unhide extra to fix docs build."

parents fed9c11a 9ab3fd45

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/Intent.java

+1 −2
Original line number Diff line number Diff line
@@ -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&lt;String&gt;</code>.

     * @hide

     */

    public static final String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES";