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

Commit 31913298 authored by rich cannings's avatar rich cannings Committed by Android (Google) Code Review
Browse files

Merge "Add Intent extras to pass to package verifiers"

parents fa30e180 368ed010

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5806,7 +5806,9 @@ package android.content { 
    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_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";

    field public static final java.lang.String EXTRA_ORIGINATING_URL = "android.intent.extra.ORIGINATING_URL";

    field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";

    field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";

    field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";

    field public static final java.lang.String EXTRA_REPLACING = "android.intent.extra.REPLACING";

    field public static final java.lang.String EXTRA_RETURN_RESULT = "android.intent.extra.RETURN_RESULT";

core/java/android/content/Intent.java

+18 −0
Original line number Diff line number Diff line
@@ -570,7 +570,9 @@ import java.util.Set; 
 *     <li> {@link #EXTRA_INITIAL_INTENTS}

 *     <li> {@link #EXTRA_INTENT}

 *     <li> {@link #EXTRA_KEY_EVENT}

 *     <li> {@link #EXTRA_ORIGINATING_URL}

 *     <li> {@link #EXTRA_PHONE_NUMBER}

 *     <li> {@link #EXTRA_REFERRER}

 *     <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}

 *     <li> {@link #EXTRA_REPLACING}

 *     <li> {@link #EXTRA_SHORTCUT_ICON}
@@ -1284,6 +1286,22 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String EXTRA_NOT_UNKNOWN_SOURCE

            = "android.intent.extra.NOT_UNKNOWN_SOURCE";



    /**

     * Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} and

     * {@link #ACTION_VIEW} to indicate the URL from which the local APK in the Intent

     * data field originated from.

     */

    public static final String EXTRA_ORIGINATING_URL

            = "android.intent.extra.ORIGINATING_URL";



    /**

     * Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} and

     * {@link #ACTION_VIEW} to indicate the HTTP referrer associated with the Intent

     * data field or {@link #EXTRA_ORIGINATING_URL}.

     */

    public static final String EXTRA_REFERRER

            = "android.intent.extra.REFERRER";



    /**

     * Used as a boolean extra field with {@link #ACTION_INSTALL_PACKAGE} to install a

     * package.  Tells the installer UI to skip the confirmation with the user